Bump U-Boot to 2022.04
v2 cover Bump U-Boot to 2022.04
Since U-Boot 2022.04 the host tool mkeficapsule requires gnutls. Thus the dependency to the host variant has to be added in case the U-Boot defconfig has selected CONFIG_TOOLS_MKEFICAPSULE. Thus a new BR config option is introduced (BR2_TARGET_UBOOT_NEEDS_GNUTLS) to fullfil this dependency conditionally.
This adds additional indirect dependencies to host-libasn1, host-nettle and host-libunistring are added and will increase the buildtime.
Heiko Thiery (4):
package/nettle: add build support for host
package/libtasn1: add build support for host
package/gnutls: add build support for host
boot/uboot: bump to 2022.04
boot/uboot/Config.in | 12 ++++++++++-- boot/uboot/uboot.mk | 4 ++++ package/gnutls/gnutls.mk | 26 ++++++++++++++++++++++++++ package/libtasn1/libtasn1.mk | 1 + package/nettle/nettle.mk | 1 + 5 files changed, 42 insertions(+), 2 deletions(-)
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/4 package/nettle: add build support for host
---
v2: no change
package/nettle/nettle.mk | 1 + 1 file changed, 1 insertion(+)
package/nettle/nettle.mk +1 -0
@@ -27,3 +27,4 @@ NETTLE_CONF_OPTS += --disable-arm-neon endif $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedRe: [Buildroot] [PATCH v2 1/4] package/nettle: add build support for host
Quoted 3 lines · On Tue, 31 May 2022 12:59:00 +0200 Heiko Thiery <[email protected]> wrote:
Signed-off-by Heiko Thiery <[email protected]>---
v2: no change
Applied to next, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/4 package/libtasn1: add build support for host
In reply to Heiko Thiery---
v2: no change
package/libtasn1/libtasn1.mk | 1 + 1 file changed, 1 insertion(+)
package/libtasn1/libtasn1.mk +1 -0
@@ -29,3 +29,4 @@ endef LIBTASN1_POST_INSTALL_TARGET_HOOKS += LIBTASN1_REMOVE_PROGS $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedRe: [Buildroot] [PATCH v2 2/4] package/libtasn1: add build support for host
Quoted 3 lines · On Tue, 31 May 2022 12:59:01 +0200 Heiko Thiery <[email protected]> wrote:
Signed-off-by Heiko Thiery <[email protected]>---
v2: no change
Applied to next, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/4 package/gnutls: add build support for host
In reply to Heiko Thiery---
v2: no change
package/gnutls/gnutls.mk | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
package/gnutls/gnutls.mk +26 -0
@@ -41,6 +41,31 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ gl_cv_func_gettimeofday_clobber=no GNUTLS_INSTALL_STAGING = YES +HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle +HOST_GNUTLS_CONF_OPTS = \ + --disable-doc \ + --disable-guile \ + --disable-libdane \ + --disable-rpath \ + --disable-tests \ + --without-included-unistring \ + --without-libcrypto-prefix \ + --without-libdl-prefix \ + --without-libev-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libpthread-prefix \ + --without-libseccomp-prefix \ + --without-librt-prefix \ + --without-libz-prefix \ + --without-tpm \ + --disable-openssl-compatibility \ + --without-libbrotli \ + --without-idn \ + --without-p11-kit \ + --without-zlib \ + --without-libzstd + ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) GNUTLS_LICENSE_FILES += doc/COPYING
@@ -103,3 +128,4 @@ endif GNUTLS_CONF_ENV += LIBS="$(GNUTLS_LIBS)" $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedRe: [Buildroot] [PATCH v2 3/4] package/gnutls: add build support for host
Quoted 3 lines · On Tue, 31 May 2022 12:59:03 +0200 Heiko Thiery <[email protected]> wrote:
Signed-off-by Heiko Thiery <[email protected]>---
v2: no change
Applied to next, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/4 boot/uboot: bump to 2022.04
In reply to Heiko ThierySince U-Boot 2022.04 a host dependency to gnutls is required if the U-Boot board configuration has CONFIG_TOOLS_MKEFICAPSULE enabled. So introduce a new BR U-Boot config option BR2_TARGET_UBOOT_NEEDS_GNUTLS to solve this problem.
---
v2: add new config option as proposed by Thomas
boot/uboot/Config.in | 12 ++++++++++-- boot/uboot/uboot.mk | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-)
boot/uboot/Config.in +10 -2
@@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2022.01" + bool "2022.04" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version"
@@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.04" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -182,6 +182,14 @@ config BR2_TARGET_UBOOT_NEEDS_LZOP the case when the board configuration has CONFIG_SPL_LZO enabled. +config BR2_TARGET_UBOOT_NEEDS_GNUTLS + bool "U-Boot needs gnutls" + help + Select this option if your U-Boot board configuration + requires gnutls to be available on the host. This is typically + the case when the board configuration has CONFIG_TOOLS_MKEFICAPSULE + enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
boot/uboot/uboot.mk +4 -0
@@ -227,6 +227,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y) UBOOT_DEPENDENCIES += host-lzop endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_GNUTLS),y) +UBOOT_DEPENDENCIES += host-gnutls +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 4/4] boot/uboot: bump to 2022.04
Hello Heiko,
Quoted 6 lines · On Tue, 31 May 2022 12:59:05 +0200 Heiko Thiery <[email protected]> wrote:
Since U-Boot 2022.04 a host dependency to gnutls is required if the U-Boot board configuration has
CONFIG_TOOLS_MKEFICAPSULEenabled. So introduce a new BR U-Boot config optionBR2_TARGET_UBOOT_NEEDS_GNUTLSto solve this problem.Signed-off-by Heiko Thiery <[email protected]>
I've split this into two patches, one doing the bump, one adding the new option.
Regarding the bump, you had forgotten the update of uboot.hash with the hash of the 2022.04 U-Boot tarball.
Also, there was a minor check-package warning related to the formatting of the help text in the Config.in file.
So, overall, applied to next, with the above issues fixed. Thanks a lot!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 4/4] boot/uboot: bump to 2022.04
Hi Thomas,
Am Mi., 1. Juni 2022 um 23:43 Uhr schrieb Thomas Petazzoni <[email protected]>:
Quoted 11 lines
Hello Heiko,
Quoted 5 lines · On Tue, 31 May 2022 12:59:05 +0200 Heiko Thiery <[email protected]> wrote:
Since U-Boot 2022.04 a host dependency to gnutls is required if the U-Boot board configuration has
CONFIG_TOOLS_MKEFICAPSULEenabled. So introduce a new BR U-Boot config optionBR2_TARGET_UBOOT_NEEDS_GNUTLSto solve this problem.
Quoted 4 lines
Quoted 1 line
Signed-off-by Heiko Thiery <[email protected]>I've split this into two patches, one doing the bump, one adding the new option.
That makes sense.
Quoted 3 lines
Regarding the bump, you had forgotten the update of uboot.hash with the hash of the 2022.04 U-Boot tarball.
Damn.
Quoted 4 lines
Also, there was a minor check-package warning related to the formatting of the help text in the Config.in file.
So, overall, applied to next, with the above issues fixed. Thanks a lot!
Thanks for doing that.
Quoted 5 lines
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com
Signature · 5 lines
Heiko _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot