Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.8 -> 1.22.8
On Wed, Feb 19, 2020 at 12:19:19PM +0100, Ulrich Ölmann wrote: > Instead of hardcoding NetworkManager's major & minor versions in the URL > derive > that information from the already existing parameter. > > 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 prepare with all options enabled fails with: Run-time dependency mm-glib found: YES 1.12.6 Run-time dependency mobile-broadband-provider-info found: NO (tried pkgconfig) meson.build:532:2: ERROR: Dependency "mobile-broadband-provider-info" not found, tried pkgconfig Michael > --- > This is an implicit v2 with respect to "networkmanager: version bump 1.20.8-> > 1.22.6" > > rules/networkmanager.make | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > index de0e755b3a5d..037a1735a368 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.8 > +NETWORKMANAGER_MD5 := b512b4985fe3b7e0b37fdac7ab5b8284 > 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/$(basename > $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_SOURCE:= > $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) > NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later > -NETWORKMANAGER_LICENSE_FILES := > file://COPYING;md5=cbbffd568227ada506640fe950a4823b > +NETWORKMANAGER_LICENSE_FILES := > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > > # > > # Prepare > @@ -67,9 +67,11 @@ NETWORKMANAGER_CONF_OPT = \ > -Dnetconfig=false \ > -Dnmcli=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMCLI) \ > -Dnmtui=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMTUI) \ > + -Dnm_cloud_setup=false \ > -Dofono=false \ > -Dovs=false \ > -Dpolkit=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_POLKIT) \ > + -Dconfig_auth_polkit_default=default \ > -Dpolkit_agent=false \ > -Dppp=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_PPP) \ > -Dpppd=/usr/sbin/pppd \ > -- > 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
Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.8-> 1.22.6
On Fri, Feb 14 2020 at 09:36 +0100, Michael Olbrich wrote: > 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) Just sent an implicit v2 bumping NetworkManager's version up to 1.22.8 which has been released yesterday. Ulrich > 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. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 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 v2] tf-a: new package for ARM trusted firmware A
Hi, On 2/14/20 2:19 PM, Michael Olbrich wrote: > 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 '-->' ok. > >> +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. It can be a commit hash as well. I adjusted the description. > >> + >> +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. ok. > >> + >> +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'. ARM's Juno board maybe. I removed the default. The rule should always error now when it's enabled but this setting isn't configured > >> + >> +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
