Re: [ptxdist] Building packages but not including them in the the resulting firmware image
It's lame to reply to your messages, but as always, right after posting a question, the answer pops up and it's embarrassingly obvious. Kindly please disregard and sorry for the noise. Best regards, Mircea C. On 14.02.20 18:33, Mircea Ciocan wrote: Hello everybody, I'm trying to implement the following solution: I have a base firmware image configuration and a number of optional packages, for some later choices of the customers. I don't want to have the optional packages installed in the base firmware image at all, no matter the choices, but have them as installable packages in separate IPKs for later use. So far, playing with the, rather sparse documented, feature of _collections_, I was only able to build different monolithic firmware versions, when I was marking the optional packages with "m" and with "y" in the collection file. The separate IPKs are build, but they're also installed in the fw image, I didn't find a way to build them as packages and exclude form installing in the firmware image. Is there currently a way to that during a single run, to build the base firmware and alongside of it, separate IPKs to be installed later with OPKG ? So far right, now I have to do two runs, one with collections and one without and discard the "fat" resulting image, which is rather cumbersome. Best regards, Mircea C. ___ ptxdist mailing list ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Building packages but not including them in the the resulting firmware image
Hello everybody, I'm trying to implement the following solution: I have a base firmware image configuration and a number of optional packages, for some later choices of the customers. I don't want to have the optional packages installed in the base firmware image at all, no matter the choices, but have them as installable packages in separate IPKs for later use. So far, playing with the, rather sparse documented, feature of _collections_, I was only able to build different monolithic firmware versions, when I was marking the optional packages with "m" and with "y" in the collection file. The separate IPKs are build, but they're also installed in the fw image, I didn't find a way to build them as packages and exclude form installing in the firmware image. Is there currently a way to that during a single run, to build the base firmware and alongside of it, separate IPKs to be installed later with OPKG ? So far right, now I have to do two runs, one with collections and one without and discard the "fat" resulting image, which is rather cumbersome. Best regards, Mircea C. ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] tf-a: new package for ARM trusted firmware A
On Wed, Feb 12, 2020 at 05:40:33PM +0100, Ahmad Fatoum wrote: > Trusted Firmware-A (TF-A) is a reference implementation of secure world > software for Arm A-Profile architectures (Armv8-A and Armv7-A). > > Cc: Alejandro Vazquez > Signed-off-by: Rouven Czerwinski > Signed-off-by: Ahmad Fatoum > --- > v1 -> v2: > - Made TF_A_ARCH_MAJOR configurable to support 32 bit ARMv8 (Guillermo) > - Replaces stm32mp-specific TF_A_DTB with TF_A_EXTRA_ARGS to contain >all board/vendor specific options > - removed reference to no longer existing CREDITS file > - removed TF_A_MAKE_OPT contents that are set elsewhere > - reduced uses of += in favor of directly appending to the string > - delete old build directory in prepare instead of compile > - use default compile stage (Guillermo) > - install artifacts to sysroot /usr/lib/firmware in install stage > - install artifacts to IMAGEDIR in targetinstall > - fix clean stage to delete proper artifacts > --- > platforms/tf-a.in | 138 ++ > rules/tf-a.make | 114 ++ > 2 files changed, 252 insertions(+) > create mode 100644 platforms/tf-a.in > create mode 100644 rules/tf-a.make > > diff --git a/platforms/tf-a.in b/platforms/tf-a.in > new file mode 100644 > index ..f3971c4c2a3a > --- /dev/null > +++ b/platforms/tf-a.in > @@ -0,0 +1,138 @@ > +## SECTION=bootloader > + > +menuconfig TF_A > + select BOOTLOADER > + prompt "ARM Trusted Firmware-A" Spaces at the end to align the '-->' > + depends on ARCH_ARM || ARCH_ARM64 > + bool > + > +if TF_A > + > +config TF_A_ARCH_STRING > +string > +default "aarch32" if ARCH_ARM > +default "aarch64" if ARCH_ARM64 > + > +choice > + prompt "TF-A Architecture" > + default TF_A_ARM_ARCH_MAJOR_7 if ARCH_ARM > + default TF_A_ARM_ARCH_MAJOR_8 if ARCH_ARM64 > + help > + Architecture version major number > + > + config TF_A_ARM_ARCH_MAJOR_7 > + depends on ARCH_ARM > + prompt "ARMv7" > + bool > + > + config TF_A_ARM_ARCH_MAJOR_8_32_BIT > + depends on ARCH_ARM > + prompt "ARMv8 32-bit" > + bool > + > + config TF_A_ARM_ARCH_MAJOR_8 > + depends on ARCH_ARM64 > + prompt "ARMv8" > + bool > + > +endchoice > + > +config TF_A_ARM_ARCH_MAJOR > +int > +default 7 if TF_A_ARM_ARCH_MAJOR_7 > +default 8 if TF_A_ARM_ARCH_MAJOR_8_32_BIT > +default 8 if TF_A_ARM_ARCH_MAJOR_8 > + > +config TF_A_VERSION > + string > + default "v2.2" > + prompt "TF-A version" > + help > + Enter the TF-A version you want to build. Usally something like "v2.2" You should mention that this is the tag name from the git repository. > + > +config TF_A_MD5 > + string > + default "bb300e5a62c911e189c80d935d497a4b" > + prompt "TF-A source md5" TF_A_VERSION and TF_A_MD5 should be the first two sub options. > + > +config TF_A_PLATFORM > + string > + prompt "TF-A target platform" > + help > + The TF-A target platform. > + > +config TF_A_ARM_ARCH_MINOR > + depends on TF_A_ARM_ARCH_MAJOR_8 || TF_A_ARM_ARCH_MAJOR_8_32_BIT > + int > + default 0 > + prompt "TF-A target ARMv8.MINOR version" > + help > + The minor version of the ARMv8 architecture targeted. Defaults to 0. > + > +config TF_A_EXTRA_ARGS > + string > + prompt "TF-A extra build arguments" > + help > + Extra platform-specific build arguments to pass to the TF-A build > + process, e.g. DTB_FILE_NAME= for the stm32mp1 > + > +config TF_A_ARTIFACTS > + string > + prompt "TF-A artifact file names" > + default "bl2.bin" > + help > + A space-separated list of artifacts to copy to the image directory. > + All file names are relative to the appropriate TF-A platform build > + directory. Where does the default come from? When I tried this, the only file that existed was 'bl31.bin'. > + > +comment "Payloads" > + > +choice > + prompt "BL32 Payload" > + default TF_A_BL32_NONE > + help > + payload for BL32 (Secure World OS) > + > + config TF_A_BL32_NONE > + prompt "None" > + bool > + > + config TF_A_BL32_SP_MIN > + depends on ARCH_ARM > + prompt "sp_min" > + bool > + > + config TF_A_BL32_TSP > + depends on ARCH_ARM64 > + prompt "Test Secure Payload" > + bool > + > +endchoice > + > +if TF_A_BL32_TSP > +choice TF_A_BL32_TSP_RAM_LOCATION > + prompt "TSP location" > + default TF_A_BL32_TSP_RAM_LOCATION_TSRAM > + > + config TF_A_BL32_TSP_RAM_LOCATION_TSRAM > + prompt "Trusted SRAM" > + bool > + > + config TF_A_BL32_TSP_RAM_LOCATION_TDRAM > + prompt "Trusted DRAM (if available)" > + bool > + > + config
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote:
> From: Björn Esser
>
> The open62541 project is an open source implementation of the OPC UA
> communication infrastructure which is used in industrial control.
>
> Signed-off-by: Björn Esser
> [uol: adjusted commit message]
> Signed-off-by: Ulrich Ölmann
> ---
> v2 --> v3: adjusted commit message
>
> ...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
> patches/open62541-1.0/series | 4 +
> rules/host-open62541.in | 6 +
> rules/host-open62541.make | 50
> rules/open62541.in| 13 +
> rules/open62541.make | 140 +++
> 6 files changed, 437 insertions(+)
> create mode 100644
> patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
> create mode 100644 patches/open62541-1.0/series
> create mode 100644 rules/host-open62541.in
> create mode 100644 rules/host-open62541.make
> create mode 100644 rules/open62541.in
> create mode 100644 rules/open62541.make
>
> diff --git
> a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
>
> b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
> new file mode 100644
> index ..0dfd003518ed
> --- /dev/null
> +++
> b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
> @@ -0,0 +1,224 @@
> +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
> +Date: Mon, 2 Dec 2019 14:38:38 +0100
> +Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +This makes it easier for developers to keep all ua-nodesets XML
> +definitions in a common location.
> +
> +Backported from: https://github.com/open62541/open62541/pull/3310
> +
> +Signed-off-by: Björn Esser
> +---
> + CMakeLists.txt| 14 +-
> + doc/nodeset_compiler.rst | 22 +++---
> + examples/CMakeLists.txt | 4
> + examples/nodeset/CMakeLists.txt | 6 +++---
> + tests/nodeset-compiler/CMakeLists.txt | 14 +++---
> + tools/cmake/macros_public.cmake | 2 +-
> + 6 files changed, 31 insertions(+), 31 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index d426e1da66fe..fbbafd8f2791 100644
> +--- a/CMakeLists.txt
> b/CMakeLists.txt
> +@@ -15,7 +15,6 @@ include(GNUInstallDirs)
> +
> + # Set when installed via make install
> + set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
> +-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
> +
> + include(macros_internal)
> + include(macros_public)
> +@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
> (uses mbedTLS)" OFF)
> + option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
> Device Server Profile" OFF)
> + option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
> +
> ++if(NOT UA_NODESET_DIR)
> ++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
> ++endif()
> ++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
> ++
> + # Namespace Zero
> + set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
> namespace zero (minimal/reduced/full)")
> + SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
> "FULL")
> +@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
> +
> + if(UA_NAMESPACE_ZERO STREQUAL "FULL")
> + if(NOT UA_FILE_NS0)
> +-set(UA_FILE_NS0
> ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
> ++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
> + endif()
> + set(UA_FILE_NODESETS "${UA_FILE_NS0}")
> +
> +@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
> + endif()
> +
> +
> +-set(UA_FILE_NODEIDS
> ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
> +-set(UA_FILE_STATUSCODES
> ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
> +-set(UA_FILE_TYPES_BSD
> ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
> ++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
> ++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
> ++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
> + else()
> + if(NOT UA_FILE_NS0)
> + set(UA_FILE_NS0
> ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
> +diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
> +index dd752ccd70a9..34fc8f800480 100644
> +--- a/doc/nodeset_compiler.rst
> b/doc/nodeset_compiler.rst
> +@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen``
> nodesets::
> + # Generate types and namespace for DI
> + ua_generate_nodeset_and_datatypes(
> + NAME "di"
> +-FILE_CSV
Re: [ptxdist] [PATCH v5 3/3] nodejs_packages: new package
On Tue, Feb 04, 2020 at 08:53:59AM +0100, Ulrich Ölmann wrote: > From: Björn Esser > > This is a dummy package to specify and install required Node.js packages for > the > target system. > > The management of those packages and their dependencies is handled with > Yarn (run through host-nodejs) to maintain a reproducible offline cache that > is > stored in local_src/nodejs_packages. > > Signed-off-by: Björn Esser > [uol: adjusted commit message and Kconfig menu file's help texts, integrated > Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL, removed one > square bracket in a shell test and wrapped install/cp into call of execute and > world/execute] > Signed-off-by: Ulrich Ölmann > --- > v3 --> v4: adjusted commit message and Kconfig menu file's help texts & fixed >NODEJS_PACKAGES_URL > Range-diff of v5 against v4: > 3: ccd2b44a8d92 ! 3: 1a73ebbd6e7e nodejs_packages: new package > @@ Commit message > stored in local_src/nodejs_packages. > > Signed-off-by: Björn Esser > -[uol: adjusted commit message and Kconfig menu file's help texts & > fixed > -NODEJS_PACKAGES_URL] > +[uol: adjusted commit message and Kconfig menu file's help texts, > integrated > +Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL, > removed one > +square bracket in a shell test and wrapped install/cp into call of > execute and > +world/execute] > Signed-off-by: Ulrich Ölmann > > ## rules/nodejs_packages.in (new) ## > @@ rules/nodejs_packages.in (new) > + > + [1] https://legacy.yarnpkg.com/en/docs/dependency-versions/ > + > ++config NODEJS_PACKAGES_LICENSE > ++string > ++prompt "Licenses of to be installed Node.js packages" > ++default "unknown" > ++help > ++ Manually compiled list of licenses that the to be installed > Node.js > ++ packages are distributed under, see description of the > variable > ++ *_LICENSE in [1]. > ++ > ++ ATTENTION: be aware of the fact that Node.js packages usually > depend > ++ on additional Node.js packages that Yarn installs as well and > that > ++ this propagates recursively resulting in an unknown number of > Node.js > ++ packages on the target with an unknown set of licenses that > they may > ++ be utilized under. Hence you carefully need to examine all of > them > ++ individually to create a reliable list of licenses. > ++ > ++ [1] > https://www.ptxdist.org/doc/dev_manual.html#some-notes-about-licenses > ++ > +config NODEJS_PACKAGES_OFFLINE > +bool > -+prompt "lock offline cache for offline/production use" > ++prompt "Lock offline cache for offline/production use" > +help > -+ This option locks the offline cache for installing the nodejs > packages > -+ and allows their installation during the build of the BSP > without any > -+ need for internet connectivity. > ++ This option locks the offline cache for installing the Node.js > ++ packages and allows their installation during the build of > the BSP > ++ without any need for internet connectivity. > + > + Enabling this option is highly recommended for production use. > + > @@ rules/nodejs_packages.make (new) > +NODEJS_PACKAGES_URL := > lndir://$(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL) > +NODEJS_PACKAGES_DIR := $(BUILDDIR)/$(NODEJS_PACKAGES) > +NODEJS_PACKAGES_CACHE := > $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn_cache > -+NODEJS_PACKAGES_LICENSE := unknown > ++NODEJS_PACKAGES_LICENSE := $(call remove_quotes, > $(PTXCONF_NODEJS_PACKAGES_LICENSE)) > + > +NODEJS_PACKAGES_LIST:= $(call remove_quotes, > $(PTXCONF_NODEJS_PACKAGES_LIST)) > + > @@ rules/nodejs_packages.make (new) > +\"license\": \"UNLICENSED\", \ > +\"private\": true \ > +}" > $(NODEJS_PACKAGES_DIR)/package.json > -+if [[ ! -f $(YARN_LOCK) ]]; then \ > ++if [ ! -f $(YARN_LOCK) ]; then \ > +touch $(YARN_LOCK); \ > +ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \ > +fi > @@ rules/nodejs_packages.make (new) > + > +$(STATEDIR)/nodejs_packages.install: > +@$(call targetinfo) > -+install -dm 0755 $(NODEJS_PACKAGES_PKGDIR)/usr/lib > -+cp -pr $(NODEJS_PACKAGES_DIR)/node_modules > $(NODEJS_PACKAGES_PKGDIR)/usr/lib > ++@$(call world/execute, HOST_UA_NODESET, \ > ++install -dm 0755 $(NODEJS_PACKAGES_PKGDIR)/usr/lib) > ++@$(call execute, HOST_UA_NODESET, \ > ++
Re: [ptxdist] [PATCH] u-boot: Add support for custom make options
Hi all, A little explanation on this. I need to pass DEVICE_TREE=xxx to uboot as this is the "official" way to build u-boot for the stm32mp1 platform with a device tree other than the board's default. I started preparing a patch to allow setting a DEVICE_TREE value specifically, but there are other ways to do the same, e.g. EXT_DTB to specify a precompiled device tree instead. So I though perhaps a generic mechanism would be more useful. I also had a look at buildroot and a similar (generic) mechanism exists as well, so I ended up doing it like that. Comments welcome. Guillermo El vie., 14 feb. 2020 a las 12:07, Guillermo Rodríguez () escribió: > > Add a generic mechanism to allow passing custom make options to > U-boot. This can be used for example to pass a DEVICE_TREE= value. > > Signed-off-by: Guillermo Rodriguez > --- > platforms/u-boot.in | 7 +++ > rules/u-boot.make | 3 ++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 50fb008a3..491faed60 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -71,6 +71,13 @@ config U_BOOT_CONFIG > > endif > > +config U_BOOT_CUSTOM_MAKE_OPTS > + prompt "Custom make options" > + string > + help > + List of custom make options passed at build time. Can be > + used for example to pass a DEVICE_TREE= value. > + > choice > prompt "Generate environment image" > default U_BOOT_ENV_IMAGE_NONE > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 0c6bccc71..e386dc4d2 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -55,7 +55,8 @@ U_BOOT_WRAPPER_BLACKLIST := \ > U_BOOT_CONF_OPT:= \ > -C $(U_BOOT_DIR) \ > O=$(U_BOOT_BUILD_DIR) \ > - V=$(PTXDIST_VERBOSE) > + V=$(PTXDIST_VERBOSE) \ > + $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS)) > > U_BOOT_MAKE_ENV:= \ > CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ > -- > 2.21.0 > -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] u-boot: Add support for custom make options
Add a generic mechanism to allow passing custom make options to U-boot. This can be used for example to pass a DEVICE_TREE= value. Signed-off-by: Guillermo Rodriguez --- platforms/u-boot.in | 7 +++ rules/u-boot.make | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platforms/u-boot.in b/platforms/u-boot.in index 50fb008a3..491faed60 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -71,6 +71,13 @@ config U_BOOT_CONFIG endif +config U_BOOT_CUSTOM_MAKE_OPTS + prompt "Custom make options" + string + help + List of custom make options passed at build time. Can be + used for example to pass a DEVICE_TREE= value. + choice prompt "Generate environment image" default U_BOOT_ENV_IMAGE_NONE diff --git a/rules/u-boot.make b/rules/u-boot.make index 0c6bccc71..e386dc4d2 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -55,7 +55,8 @@ U_BOOT_WRAPPER_BLACKLIST := \ U_BOOT_CONF_OPT:= \ -C $(U_BOOT_DIR) \ O=$(U_BOOT_BUILD_DIR) \ - V=$(PTXDIST_VERBOSE) + V=$(PTXDIST_VERBOSE) \ + $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS)) U_BOOT_MAKE_ENV:= \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] tf-a: new package for ARM trusted firmware A
Hi, Ahmad. I took a look at your TF-A rules and I've checked that it generates the binaries correctly. Thanks! ;) Cheers. Alejandro. El jue., 13 feb. 2020 a las 16:33, Guillermo Rodriguez Garcia () escribió: > > El jue., 13 feb. 2020 a las 16:27, Ahmad Fatoum > () escribió: > > > > On 2/13/20 4:24 PM, Guillermo Rodriguez Garcia wrote: > > > El jue., 13 feb. 2020 a las 16:08, Ahmad Fatoum > > > () escribió: > > >> > > >> On 2/13/20 4:05 PM, Guillermo Rodriguez Garcia wrote: > > >> > > >>> > > >>> +# > > >>> > > >>> +# Install > > >>> +# > > >>> > > >>> + > > >>> +$(STATEDIR)/tf-a.install: > > >>> + @$(call targetinfo) > > >>> +ifeq ($(TF_A_ARTIFACTS_SRC),) > > >>> + $(warning TF_A_ARTIFACTS is empty. nothing to install.) > > >>> +else > > >>> + @install -m644 -D \ > > >>> + > > >>> --target-directory=$(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware \ > > >> > > >> > > >>> OK this makes sense. > > >>> > > >>> But, you should at least make sure > > >>> $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware exists before trying to > > >>> copy anything into it. > > >> > > >> That's why -D is there. From man install(1): > > >> > > >> -D create all leading components of DEST except the last, or all > > >> components of > > >> --target-directory, then copy SOURCE to DEST > > > > > > Yes but the effect of -D combined with --target-directory does not > > > seem to be standard; my version of install does not support it. > > > The man page for my version says: > > > > > > -D create all leading components of DEST except the last, then > > > copy SOURCE to DEST > > > > > > And a quick test yields the following: > > > > > > $ touch test > > > $ install -D --target-directory a/b/c test > > > install: failed to access 'a/b/c': No such file or director > > > > > > I guess it's better to avoid relying on that behaviour and create the > > > directory explicitly instead. > > > > I see. Will replace with separate install -d in a v3 then. > > You might also want to update the targetinstall stage: > > - If IMAGEDIR is guaranteed to exist when the targetinstall rule runs, > then the -D option can be dropped > - If IMAGEDIR is not guaranteed to exist, then -D will not create the > directory properly in the way the command is currently written, and > you probably want also explicitly create the directory > > Thx, > > Guillermo > > > > > > > > > BR, > > > > > > Guillermo Rodriguez Garcia > > > guille.rodrig...@gmail.com > > > > > > > > > -- > > Pengutronix e.K. | | > > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > > > -- > Guillermo Rodriguez Garcia > guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] varoverlayfs: support kernels without metacopy
metacopy=on is supported on Linux 4.19+ only. As metacopy is unlikely to have a significant effect on the /var overlay anyways, simply remove the option. Signed-off-by: Matthias Schiffer --- projectroot/usr/lib/systemd/system/var.mount | 1 - 1 file changed, 1 deletion(-) diff --git a/projectroot/usr/lib/systemd/system/var.mount b/projectroot/usr/lib/systemd/system/var.mount index bd6350237..3b686a260 100644 --- a/projectroot/usr/lib/systemd/system/var.mount +++ b/projectroot/usr/lib/systemd/system/var.mount @@ -8,4 +8,3 @@ Where=/var # note: this is a dummy filesystem only to trigger the corresponding mount helper What=varoverlayfs Type=varoverlayfs -Options=metacopy=on -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3] parted: update to 3.3
Fixes build against recent glibc. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- rules/parted.in | 12 ++-- rules/parted.make | 10 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rules/parted.in b/rules/parted.in index 2e9f54a31..dbaef4b0a 100644 --- a/rules/parted.in +++ b/rules/parted.in @@ -1,18 +1,18 @@ -## SECTION=staging -## old section: -### SECTION=shell_and_console +## SECTION=shell_and_console config PARTED tristate prompt "parted" - select GETTEXT + select HOST_GETTEXT select READLINE + select LIBUUID select E2FSPROGS select NCURSES + depends on !BUSYBOX_PARTPROBE || ALLYES help The GNU Parted program allows you to create, destroy, resize, move, and copy hard disk partitions. Parted can be used for creating space for new operating systems, reorganizing disk usage, and copying data to new hard disks. - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with glibc-2.28. +comment "busybox' partprobe is selected!" + depends on BUSYBOX_PARTPROBE diff --git a/rules/parted.make b/rules/parted.make index 6b994f372..eca3f9eee 100644 --- a/rules/parted.make +++ b/rules/parted.make @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted # # Paths and names # -PARTED_VERSION := 2.3 -PARTED_MD5 := 30ceb6df7e8681891e865e2fe5a7903d +PARTED_VERSION := 3.3 +PARTED_MD5 := 090655d05f3c471aa8e15a27536889ec PARTED := parted-$(PARTED_VERSION) -PARTED_SUFFIX := tar.gz +PARTED_SUFFIX := tar.xz PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX)) PARTED_SOURCE := $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX) PARTED_DIR := $(BUILDDIR)/$(PARTED) @@ -29,8 +29,8 @@ PARTED_LICENSE:= GPL-3.0-only PARTED_CONF_TOOL := autoconf PARTED_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-device-mapper \ - --disable-Werror + --without-readline \ + --disable-device-mapper # # Target-Install -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] (EXT) Re: [PATCH] gettext: deterministically build with included libraries
On Fri, 2020-02-14 at 10:48 +0100, Matthias Schiffer wrote: > On Fri, 2020-02-14 at 10:12 +0100, Michael Olbrich wrote: > > On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote: > > > gettext's configure will automatically used the libraries it > > > finds, > > > and > > > fall back to included versions otherwise. Avoid this non- > > > deterministic > > > behaviour by explicitly choosing the included libraries. > > > > > > In particular, this issue can break parallel builds with --force > > > after > > > config changes due to a race condition: > > > > > > 1. gettext configure finds libraries from a previous build in > > > sysroot, > > >decides not to use the included libraries > > > 2. Installed libraries gets cleaned from sysroot due to --force > > > 3. gettext build fails, as it attemps to use the now removed > > > libraries > > > > I'd prefer to select glib and libxml instead. Or are there any > > reasons not > > to do this? > > Fine with me. Right now I can't reproduce gettext picking up the sysroot libraries at all - there seem to be other factors involved, making it difficult to get the configuration deterministic. In addition, adding GLIB and LIBXML2 as dependencies significantly increases the number of dependencies, pulling in host-meson, host-ninja and libprce. Given that parted doesn't require gettext after all, I'm fine with either solution, but I currently can't put much more time into fixing this package - feel free to drop this patch if it is not acceptable in its current form. Matthias > > > > > The only current user is parted. Do you know why it needs that on > > the > > target anyways? Most packages only need gettext at runtime. > > Hmm, this was added with the original parted rules in 2010, and I > don't > see any issues without it - in fact, configure will choose gettext > functions from libc even when full gettext is available. I'll send a > v3 > of the parted patch. > > > > > > Michael > > > > > Signed-off-by: Matthias Schiffer < > > > matthias.schif...@ew.tq-group.com > > > > > > > > > > --- > > > rules/gettext.make | 6 ++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/rules/gettext.make b/rules/gettext.make > > > index dd1d22ffb..199616c87 100644 > > > --- a/rules/gettext.make > > > +++ b/rules/gettext.make > > > @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \ > > > --disable-acl \ > > > --disable-openmp \ > > > --disable-curses \ > > > + --with-included-gettext \ > > > + --with-included-glib \ > > > + --with-included-libcroco \ > > > + --with-included-libunistring \ > > > + --with-included-libxml \ > > > --without-emacs \ > > > --without-bzip2 \ > > > --without-xz > > > > > > + > > > # -- > > > -- > > > > > > # Target-Install > > > # -- > > > -- > > > > > > -- > > > 2.17.1 > > > > > > > > > ___ > > > ptxdist mailing list > > > ptxdist@pengutronix.de > > > > > > > ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] (EXT) Re: [PATCH] gettext: deterministically build with included libraries
On Fri, 2020-02-14 at 10:12 +0100, Michael Olbrich wrote: > On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote: > > gettext's configure will automatically used the libraries it finds, > > and > > fall back to included versions otherwise. Avoid this non- > > deterministic > > behaviour by explicitly choosing the included libraries. > > > > In particular, this issue can break parallel builds with --force > > after > > config changes due to a race condition: > > > > 1. gettext configure finds libraries from a previous build in > > sysroot, > >decides not to use the included libraries > > 2. Installed libraries gets cleaned from sysroot due to --force > > 3. gettext build fails, as it attemps to use the now removed > > libraries > > I'd prefer to select glib and libxml instead. Or are there any > reasons not > to do this? Fine with me. > > The only current user is parted. Do you know why it needs that on the > target anyways? Most packages only need gettext at runtime. Hmm, this was added with the original parted rules in 2010, and I don't see any issues without it - in fact, configure will choose gettext functions from libc even when full gettext is available. I'll send a v3 of the parted patch. > > Michael > > > Signed-off-by: Matthias Schiffer > > > > --- > > rules/gettext.make | 6 ++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/rules/gettext.make b/rules/gettext.make > > index dd1d22ffb..199616c87 100644 > > --- a/rules/gettext.make > > +++ b/rules/gettext.make > > @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \ > > --disable-acl \ > > --disable-openmp \ > > --disable-curses \ > > + --with-included-gettext \ > > + --with-included-glib \ > > + --with-included-libcroco \ > > + --with-included-libunistring \ > > + --with-included-libxml \ > > --without-emacs \ > > --without-bzip2 \ > > --without-xz > > > > + > > # > > > > # Target-Install > > # > > > > -- > > 2.17.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] varoverlayfs: support kernels without metacopy
On Thu, Feb 13, 2020 at 06:22:07PM +0100, Matthias Schiffer wrote:
> metacopy=on is supported on Linux 4.19+. Add fallback for older kernels.
I think we should just drop the option. It's just a nice-to-have feature
and in most cases, it does not make a any difference. The lower filesystem
is usually empty, except for directories and maybe very small files.
Michael
>
> Signed-off-by: Matthias Schiffer
> ---
> projectroot/usr/lib/systemd/system/var.mount | 1 -
> projectroot/usr/sbin/mount.varoverlayfs | 4 +++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/projectroot/usr/lib/systemd/system/var.mount
> b/projectroot/usr/lib/systemd/system/var.mount
> index bd6350237..3b686a260 100644
> --- a/projectroot/usr/lib/systemd/system/var.mount
> +++ b/projectroot/usr/lib/systemd/system/var.mount
> @@ -8,4 +8,3 @@ Where=/var
> # note: this is a dummy filesystem only to trigger the corresponding mount
> helper
> What=varoverlayfs
> Type=varoverlayfs
> -Options=metacopy=on
> diff --git a/projectroot/usr/sbin/mount.varoverlayfs
> b/projectroot/usr/sbin/mount.varoverlayfs
> index 913004d15..efab16aef 100644
> --- a/projectroot/usr/sbin/mount.varoverlayfs
> +++ b/projectroot/usr/sbin/mount.varoverlayfs
> @@ -8,6 +8,8 @@ set -e
> systemctl start run-varoverlayfs.mount
> mkdir -p /run/varoverlayfs/upper
> mkdir -p /run/varoverlayfs/work
> -mount -t overlay
> -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work
> "${@}"
> +# metacopy=on is supported on Linux 4.19+, fall back on older kernels
> +mount -t overlay
> -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work,metacopy=on
> "${@}" ||
> + mount -t overlay
> -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work
> "${@}"
> systemctl stop run-varoverlayfs.mount
> rmdir /run/varoverlayfs
> --
> 2.17.1
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] gst-plugins-good1: qmlglsink: fix build on EGL platform without X11 headers
On Thu, Feb 13, 2020 at 06:22:06PM +0100, Matthias Schiffer wrote:
> Signed-off-by: Matthias Schiffer
> ---
>
> Considering who authored the upstream patch, I'm surprised this is not
> in PTXdist yet - it seems it was forgotten?
It probably got lost. We usually have more gst-plugins-good patches in the
BSP anyways (for v4l2 and others), so we don't notice this.
But it's a good idea to have this patch, so I'll apply this.
Michael
> ...ild-on-EGL-platform-without-X11-head.patch | 29 +++
> patches/gst-plugins-good-1.16.2/series| 4 +++
> 2 files changed, 33 insertions(+)
> create mode 100644
> patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> create mode 100644 patches/gst-plugins-good-1.16.2/series
>
> diff --git
> a/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
>
> b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> new file mode 100644
> index 0..fdf6ec413
> --- /dev/null
> +++
> b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> @@ -0,0 +1,29 @@
> +From: Philipp Zabel
> +Date: Tue, 3 Dec 2019 11:36:07 +0100
> +Subject: [PATCH] qmlglsink: fix build on EGL platform without X11 headers
> +
> +If Mesa is built without X11 headers, building against Mesa EGL headers
> +requires a dependency on egl.pc, to define MESA_EGL_NO_X11_HEADERS.
> +This fixes a build error when compiling ext/qt/gstqtglutility.cc:
> +
> + In file included from /usr/include/EGL/egl.h:39,
> + from /usr/include/gstreamer-1.0/gst/gl/egl/gstegl.h:44,
> + from
> ../gst-plugins-good-1.16.1/ext/qt/gstqtglutility.cc:43:
> + /usr/include/EGL/eglplatform.h:124:10: fatal error: X11/Xlib.h: No such
> file or directory
> +---
> + ext/qt/meson.build | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/ext/qt/meson.build b/ext/qt/meson.build
> +index 5f040c844174..43ddc6092b21 100644
> +--- a/ext/qt/meson.build
> b/ext/qt/meson.build
> +@@ -89,6 +89,8 @@ if have_cxx and build_gstgl
> + if gst_gl_have_platform_egl
> + # Embedded linux (e.g. i.MX6) with or without windowing support
> + qt_defines += ['-DHAVE_QT_EGLFS']
> ++ egl_dep = dependency('egl', required : false)
> ++ optional_deps += egl_dep
> + have_qt_windowing = true
> + if have_qpa_include
> + # Wayland windowing
> diff --git a/patches/gst-plugins-good-1.16.2/series
> b/patches/gst-plugins-good-1.16.2/series
> new file mode 100644
> index 0..4a1386d15
> --- /dev/null
> +++ b/patches/gst-plugins-good-1.16.2/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> +# 272968855eb57a1460afb6469b245e5d - git-ptx-patches magic
> --
> 2.17.1
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] gettext: deterministically build with included libraries
On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote: > gettext's configure will automatically used the libraries it finds, and > fall back to included versions otherwise. Avoid this non-deterministic > behaviour by explicitly choosing the included libraries. > > In particular, this issue can break parallel builds with --force after > config changes due to a race condition: > > 1. gettext configure finds libraries from a previous build in sysroot, >decides not to use the included libraries > 2. Installed libraries gets cleaned from sysroot due to --force > 3. gettext build fails, as it attemps to use the now removed libraries I'd prefer to select glib and libxml instead. Or are there any reasons not to do this? The only current user is parted. Do you know why it needs that on the target anyways? Most packages only need gettext at runtime. Michael > Signed-off-by: Matthias Schiffer > --- > rules/gettext.make | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/rules/gettext.make b/rules/gettext.make > index dd1d22ffb..199616c87 100644 > --- a/rules/gettext.make > +++ b/rules/gettext.make > @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \ > --disable-acl \ > --disable-openmp \ > --disable-curses \ > + --with-included-gettext \ > + --with-included-glib \ > + --with-included-libcroco \ > + --with-included-libunistring \ > + --with-included-libxml \ > --without-emacs \ > --without-bzip2 \ > --without-xz > > + > # > > # Target-Install > # > > -- > 2.17.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] parted: update to 3.3
Fixes build against recent glibc. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- rules/parted.in | 11 ++- rules/parted.make | 10 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rules/parted.in b/rules/parted.in index 2e9f54a31..75756fa7c 100644 --- a/rules/parted.in +++ b/rules/parted.in @@ -1,18 +1,19 @@ -## SECTION=staging -## old section: -### SECTION=shell_and_console +## SECTION=shell_and_console config PARTED tristate prompt "parted" + select HOST_GETTEXT select GETTEXT select READLINE + select LIBUUID select E2FSPROGS select NCURSES + depends on !BUSYBOX_PARTPROBE || ALLYES help The GNU Parted program allows you to create, destroy, resize, move, and copy hard disk partitions. Parted can be used for creating space for new operating systems, reorganizing disk usage, and copying data to new hard disks. - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with glibc-2.28. +comment "busybox' partprobe is selected!" + depends on BUSYBOX_PARTPROBE diff --git a/rules/parted.make b/rules/parted.make index 6b994f372..eca3f9eee 100644 --- a/rules/parted.make +++ b/rules/parted.make @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted # # Paths and names # -PARTED_VERSION := 2.3 -PARTED_MD5 := 30ceb6df7e8681891e865e2fe5a7903d +PARTED_VERSION := 3.3 +PARTED_MD5 := 090655d05f3c471aa8e15a27536889ec PARTED := parted-$(PARTED_VERSION) -PARTED_SUFFIX := tar.gz +PARTED_SUFFIX := tar.xz PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX)) PARTED_SOURCE := $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX) PARTED_DIR := $(BUILDDIR)/$(PARTED) @@ -29,8 +29,8 @@ PARTED_LICENSE:= GPL-3.0-only PARTED_CONF_TOOL := autoconf PARTED_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-device-mapper \ - --disable-Werror + --without-readline \ + --disable-device-mapper # # Target-Install -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] (EXT) Re: [PATCH] kmscube: switch to https URL
On Fri, 2020-02-14 at 09:40 +0100, Michael Olbrich wrote: > On Thu, Feb 13, 2020 at 06:22:03PM +0100, Matthias Schiffer wrote: > > From: Markus Niebel > > > > Signed-off-by: Markus Niebel > > Signed-off-by: Matthias Schiffer > > > > --- > > rules/kmscube.make | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/rules/kmscube.make b/rules/kmscube.make > > index a6d5d0150..94a2f31fa 100644 > > --- a/rules/kmscube.make > > +++ b/rules/kmscube.make > > @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube > > KMSCUBE_VERSION:= 2017-03-13-g803bac5 > > KMSCUBE:= kmscube-$(KMSCUBE_VERSION) > > KMSCUBE_MD5:= 781a59ab2d1d245e99a49df7c3dc1876 > > -KMSCUBE_URL:= > > git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION) > > +KMSCUBE_URL:= > > https://gitlab.freedesktop.org/mesa/kmscube.git;tag=$(KMSCUBE_VERSION > > ) > > With gitlab, we can avoid git entirely: > > https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX > ) > > Should work. > > Michael Are these archive downloads guaranteed to have stable MD5 sums with Gitlab? I know that the OpenWrt project generally avoids archive downloads from Github for this reason. Matthias > > > KMSCUBE_SUFFIX := tar.gz > > KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX) > > KMSCUBE_DIR:= $(BUILDDIR)/$(KMSCUBE) > > -- > > 2.17.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] parted: update to 3.3
On Thu, Feb 13, 2020 at 06:22:04PM +0100, Matthias Schiffer wrote: > Fixes build against recent glibc. > > Signed-off-by: Markus Niebel > Signed-off-by: Matthias Schiffer > --- > rules/parted.in | 13 - > rules/parted.make | 10 +- > 2 files changed, 13 insertions(+), 10 deletions(-) > > diff --git a/rules/parted.in b/rules/parted.in > index 2e9f54a31..10371dd73 100644 > --- a/rules/parted.in > +++ b/rules/parted.in > @@ -1,18 +1,21 @@ > -## SECTION=staging > -## old section: > -### SECTION=shell_and_console > +## SECTION=shell_and_console > config PARTED > tristate > prompt "parted" > + select HOST_GETTEXT > select GETTEXT > select READLINE > + select ICONV I don't think, this is necessary. ICONV is provided by the libc these days and this switch is only there for packages with optional iconv support. > + select UTIL_LINUX_NG > + select UTIL_LINUX_NG_LIBUUID use select LIBUUID instead. Michael > select E2FSPROGS > select NCURSES > + depends on !BUSYBOX_PARTPROBE || ALLYES > help > The GNU Parted program allows you to create, destroy, resize, move, > and copy hard disk partitions. Parted can be used for creating space > for new operating systems, reorganizing disk usage, and copying data > to new hard disks. > > - STAGING: remove in ptxdist-2020.06.0 > - Old version that need to be updated. Fails to build with glibc-2.28. > +comment "busybox' partprobe is selected!" > + depends on BUSYBOX_PARTPROBE > diff --git a/rules/parted.make b/rules/parted.make > index 6b994f372..eca3f9eee 100644 > --- a/rules/parted.make > +++ b/rules/parted.make > @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted > # > # Paths and names > # > -PARTED_VERSION := 2.3 > -PARTED_MD5 := 30ceb6df7e8681891e865e2fe5a7903d > +PARTED_VERSION := 3.3 > +PARTED_MD5 := 090655d05f3c471aa8e15a27536889ec > PARTED := parted-$(PARTED_VERSION) > -PARTED_SUFFIX:= tar.gz > +PARTED_SUFFIX:= tar.xz > PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX)) > PARTED_SOURCE:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX) > PARTED_DIR := $(BUILDDIR)/$(PARTED) > @@ -29,8 +29,8 @@ PARTED_LICENSE := GPL-3.0-only > PARTED_CONF_TOOL := autoconf > PARTED_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > - --disable-device-mapper \ > - --disable-Werror > + --without-readline \ > + --disable-device-mapper > > # > > # Target-Install > -- > 2.17.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] kmscube: switch to https URL
On Thu, Feb 13, 2020 at 06:22:03PM +0100, Matthias Schiffer wrote: > From: Markus Niebel > > Signed-off-by: Markus Niebel > Signed-off-by: Matthias Schiffer > --- > rules/kmscube.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/kmscube.make b/rules/kmscube.make > index a6d5d0150..94a2f31fa 100644 > --- a/rules/kmscube.make > +++ b/rules/kmscube.make > @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube > KMSCUBE_VERSION := 2017-03-13-g803bac5 > KMSCUBE := kmscube-$(KMSCUBE_VERSION) > KMSCUBE_MD5 := 781a59ab2d1d245e99a49df7c3dc1876 > -KMSCUBE_URL := > git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION) > +KMSCUBE_URL := > https://gitlab.freedesktop.org/mesa/kmscube.git;tag=$(KMSCUBE_VERSION) With gitlab, we can avoid git entirely: https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX) Should work. Michael > KMSCUBE_SUFFIX := tar.gz > KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX) > KMSCUBE_DIR := $(BUILDDIR)/$(KMSCUBE) > -- > 2.17.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.8-> 1.22.6
On Wed, Feb 12, 2020 at 09:30:29PM +0100, Uwe Kleine-König wrote: > On Wed, Feb 12, 2020 at 11:11:12AM +0100, Ulrich Ölmann wrote: > > Two new config options have been added in the meantime (see NetworkManager > > commits [1] & [2]) which are both set to their reasonable default values. > > > > The license did not change, but its text was adjusted - citing from > > NetworkManagers's commit [3]: > > > > The update to the GPL text is purely cosmetic. However, shipping the exact > > same file as GNU publishes may help distros that deduplicate the license > > texts > > or hardlink duplicates. > > > > [1] > > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/69f048bf0ca387d2dc4683cfdfe9d170bfceb52b > > [2] > > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/d27fcd07541ae6f524115d5b0f36e14673135ca3 > > [3] > > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/e9f2ea6c22f36cb7986d2228763629ed44b9e76b > > > > Signed-off-by: Ulrich Ölmann > > --- > > rules/networkmanager.make | 10 ++ > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > > index de0e755b3a5d..86542b6f74e1 100644 > > --- a/rules/networkmanager.make > > +++ b/rules/networkmanager.make > > @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager > > # > > # Paths and names > > # > > -NETWORKMANAGER_VERSION := 1.20.8 > > -NETWORKMANAGER_MD5 := c0ceb5ab14bfdfeee07536d94cc5c548 > > +NETWORKMANAGER_VERSION := 1.22.6 > > +NETWORKMANAGER_MD5 := 0f4b493cc0c67f94a2ad3573363eb3b2 > > NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) > > NETWORKMANAGER_SUFFIX := tar.xz > > -NETWORKMANAGER_URL := > > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > > +NETWORKMANAGER_URL := > > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.22/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > > I wonder if it would make sense to use some make magic to derive the > directory name (1.22) from NETWORKMANAGER_VERSION. > > Hmm, this is more complicated than I thought, the following works: > > EMPTY = > SPACE = $(EMPTY) $(EMPTY) > NETWORKMANAGER_MAJOR := $(subst $(SPACE),.,$(wordlist 1, 2, $(subst ., > ,$(NETWORKMANAGER_VERSION > > or > > NETWORKMANAGER_V1 = $(word 1, $(subst ., ,$(NETWORKMANAGER_VERSION))) > NETWORKMANAGER_V2 = $(word 2, $(subst ., ,$(NETWORKMANAGER_VERSION))) > NETWORKMANAGER_MAJOR = $(NETWORKMANAGER_V1).$(NETWORKMANAGER_V2) > > Unless someone can come up with something easier, probably not worth the > effort? There is a much simpler way to do this: NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) We already use this in several other packages. This does not work when a '0' for the patchlevel version is omitted but that's not the case here. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libgpiod: version bump 1.3 -> 1.5
On Thu, Jan 30, 2020 at 04:47:50PM +0100, Clemens Gruber wrote: > Signed-off-by: Clemens Gruber Right, this needs v5.5 kernel headers :-/. I need to update my test BSP before I can merge this. Ping me again if I forget about this. Michael > --- > rules/libgpiod.make | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/rules/libgpiod.make b/rules/libgpiod.make > index 088a5dab8..a8b6dd760 100644 > --- a/rules/libgpiod.make > +++ b/rules/libgpiod.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBGPIOD) += libgpiod > # > # Paths and names > # > -LIBGPIOD_VERSION := 1.3 > -LIBGPIOD_MD5 := 70a3d4738495f4ec0c5f3fa6aeb999ed > +LIBGPIOD_VERSION := 1.5 > +LIBGPIOD_MD5 := 40898c4c2c0606fe671d70532abe12d3 > LIBGPIOD := libgpiod-$(LIBGPIOD_VERSION) > LIBGPIOD_SUFFIX := tar.gz > LIBGPIOD_URL := > https://www.kernel.org/pub/software/libs/libgpiod/$(LIBGPIOD).$(LIBGPIOD_SUFFIX) > @@ -32,7 +32,6 @@ LIBGPIOD_CONF_TOOL := autoconf > LIBGPIOD_CONF_OPT:= \ > $(CROSS_AUTOCONF_USR) \ > --$(call ptx/endis, PTXCONF_LIBGPIOD_TOOLS)-tools \ > - --disable-install-tests \ > --disable-tests \ > --$(call ptx/endis, PTXCONF_LIBGPIOD_CXX)-bindings-cxx \ > --$(call ptx/endis, PTXCONF_LIBGPIOD_PYTHON3)-bindings-python > -- > 2.25.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [ANNOUNCE] PTXdist 2020.02.0 released
Hi, I'm happy to announce that I've just released ptxdist-2020.02.0. This is a bigger release this time and there are some changes that can require modifications to the BSP. The most important change is related to Python. Starting with this release, it it no longer necessary to install Python 2 on the build host for most BSPs. PTXdist itself no longer needs it and there are only a handful of packages left that need it. Related to that, all packages that need Python 2 or 3 installed on the build host must select HOST_SYSTEM_PYTHON/HOST_SYSTEM_PYTHON3. There is a python wrapper script that will check the dependency and fail if it is missing. The behaviour of ptxd_get_path changed slightly. It will no longer expand globs internally. This was necessary to allow installing files with a '\' in the name. There was only one user in PTXdist itself that relied on this behaviour. So I expect that most people won't notice this at all. There is a new global option to build the BSP with PAM support, for those that need more modern authentication during login. The rest is the usual mix of new packages, version bumps and bugfixes. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Dahl (1): cmocka: new package Andreas Pretzsch (2): haveged: systemd service: import haveged.service from haveged 1.9.2 source haveged: systemd service: move from multi-user.target to sysinit.target Björn Esser (3): ckermit: Add a patch to fix build with glibc >= 2.28. ckermit: Move out of staging. libuv: version bump 1.23.2 -> 1.34.0 Christian Hermann (3): haveged: version bump 1.9.2 -> 1.9.8 pciutils: version bump 3.3.0 -> 3.6.2 file: version bump 5.35 -> 5.36 Guillermo Rodríguez (3): udev-legacy: Fix build with recent glibc versions. u-boot: Add support for u-boot.stm32 binary weston: Add init script Ladislav Michl (13): usb-modeswitch: version bump 2.5.2 -> 2.6.0 usb-modeswitch-data: version bump 20170806 -> 20191128 libqmi: version bump 1.22.4 -> 1.24.0 modemmanager: version bump 1.10.8 -> 1.12.2 host-python-scons: version bump 3.0.1 -> 3.1.2 configure: fix GNU Make version check gpsd: Optionally install systemd unit files modemmanager: version bump 1.12.2 -> 1.12.4 pam: new package Introduce global PAM option shadow: new package util-linux: optionally build login program python3: remove extra space from LDFLAGS Marian Cichy (8): OpenCV: Update to Version 4.1.2. OpenCV: Added flag to build and integrate Examples OpenCV: Clean up configure_helper output OpenCV: Changed QT-Support from 4 to 5 OpenCV: added switch to turn on/off DNN support OpenCV: changed ptx/ifdef usage to ptx/onoff OpenCV: Update to version 4.2.0 OpenCV: make build generate pkg-config file Michael Olbrich (59): systemd: version bump 243.4 -> 244.1 ptxd_lib_dgen: add helper to get deps ptxd_lib_dgen: also provide all (recursive) deps for each package ptxd_make_world_common: propagate recursive deps wrapper: add python wrapper systemd: python3 is used to generate some files host-system-python3: fix typo in error message host-opkg-utils: version bump 0.4.1 -> 0.4.2 samba: explicitly select host-system-python libpsl: use python3 instead of python2 remove hard dependency on Python2 ptxd_get_path: don't use 'eval' ptxd_install_setup_src: fail if the file is not found ptxd_get_ipkg_files: resolve globs when calling ptxd_get_path() freeglut: version bump 2.8.1 -> 3.2.1 qt5: improve system python dependencies htop: use python3 libgpiod: add missing dependency sqlitecpp: add missing dependency ptxd_make_world_common: allow python3 == host-system-python3 as build tool libqmi: switch to python3 libqmi: version bump 1.24.0 -> 1.24.4 host-xcb-proto: use python3 xcb-proto: use python3 host-system-python*: cleanup variables host-qemu: SYSTEMPYTHON3 is now defined in rules/pre piglit: SYSTEMPYTHON3 is now defined in rules/pre libmbim: SYSTEMPYTHON3 is now defined in rules/pre gobject-introspection: SYSTEMPYTHON3 is now defined in rules/pre host-meson: version bump 0.51.2 -> 0.53.1 host-python: don't install python2 / python2-config doc: patches for ptxdist upstream should be created with git opkg-utils: fix opkg-build on CentOS 7 libpsl: drop the patch again python3: need zlib support in host-python3 for ensurepip host-libcap-ng: improve configure options Revert "python3-numpy: enable parallel building" alsa-lib: version bump 1.1.9 -> 1.2.1.2 alsa-utils: version bump 1.1.9 -> 1.2.1 udev: regenerate patches at: use GLOBAL_PAM python3: drop unnecessary LDFLAGS opencv: make sure the
