[Buildroot] [PATCH 0/4] U-Boot bump to 2022.04

[Buildroot] [PATCH 0/4] U-Boot bump to 2022.04

[Heiko Thiery]

Since U-Boot 2022.04 the host tool mkeficapsule requires gnutls. Thus the
dependency to the host variant has to be added. Unfortunatly 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         |  4 ++--
 boot/uboot/uboot.mk          |  2 +-
 package/gnutls/gnutls.mk     | 26 ++++++++++++++++++++++++++
 package/libtasn1/libtasn1.mk |  1 +
 package/nettle/nettle.mk     |  1 +
 5 files changed, 31 insertions(+), 3 deletions(-)

-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/4] package/nettle: add build support for host

[Heiko Thiery]

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 package/nettle/nettle.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index 3dbd0cb94b..bc3708ca94 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -27,3 +27,4 @@ NETTLE_CONF_OPTS += --disable-arm-neon
 endif
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/4] package/libtasn1: add build support for host

[Heiko Thiery]

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 package/libtasn1/libtasn1.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk
index ba86081df9..11ab223962 100644
--- a/package/libtasn1/libtasn1.mk
+++ b/package/libtasn1/libtasn1.mk
@@ -29,3 +29,4 @@ endef
 LIBTASN1_POST_INSTALL_TARGET_HOOKS += LIBTASN1_REMOVE_PROGS
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/4] package/gnutls: add build support for host

[Heiko Thiery]

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 package/gnutls/gnutls.mk | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index f7f3e046e9..ac83bb35d3 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -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))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/4] boot/uboot: bump to 2022.04

[Heiko Thiery]

Since U-Boot 2022.04 a host dependency to gnutls is required.

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 boot/uboot/Config.in | 4 ++--
 boot/uboot/uboot.mk  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 953c36135e..d525faea1c 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -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
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index cb26fc8d3e..86e28004c4 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -17,7 +17,7 @@ UBOOT_CPE_ID_PRODUCT = u-boot
 UBOOT_INSTALL_IMAGES = YES
 
 # u-boot 2020.01+ needs make 4.0+
-UBOOT_DEPENDENCIES = host-pkgconf $(BR2_MAKE_HOST_DEPENDENCY)
+UBOOT_DEPENDENCIES = host-pkgconf host-gnutls $(BR2_MAKE_HOST_DEPENDENCY)
 UBOOT_MAKE = $(BR2_MAKE)
 
 ifeq ($(UBOOT_VERSION),custom)
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 0/4] U-Boot bump to 2022.04

[Heiko Thiery]

Hi,

Am Sa., 21. Mai 2022 um 14:38 Uhr schrieb Heiko Thiery <heiko.thiery@gmail.com>:
>
> Since U-Boot 2022.04 the host tool mkeficapsule requires gnutls. Thus the
> dependency to the host variant has to be added. Unfortunatly this adds
> additional indirect dependencies to host-libasn1, host-nettle and
> host-libunistring are added and will increase the buildtime.
>

This should fix https://gitlab.com/buildroot.org/buildroot/-/jobs/2477067271

> 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         |  4 ++--
>  boot/uboot/uboot.mk          |  2 +-
>  package/gnutls/gnutls.mk     | 26 ++++++++++++++++++++++++++
>  package/libtasn1/libtasn1.mk |  1 +
>  package/nettle/nettle.mk     |  1 +
>  5 files changed, 31 insertions(+), 3 deletions(-)
>
> --
> 2.20.1
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/4] boot/uboot: bump to 2022.04

[Thomas Petazzoni via buildroot]

Hello,

On Sat, 21 May 2022 14:38:44 +0200
Heiko Thiery <heiko.thiery@gmail.com> wrote:

> Since U-Boot 2022.04 a host dependency to gnutls is required.

Are you sure this is an unconditional dependency?

When I read tools/Makefile, I see:

HOSTLDLIBS_mkeficapsule += -lgnutls -luuid
hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule

so it's only configurations with CONFIG_TOOLS_MKEFICAPSULE=y that need
host-gnutls.

So unless I'm missing something, the host-gnutls dependency should not
be made a new mandatory dependency, and instead a "U-Boot needs
host-gnutls" option should be added, like
BR2_TARGET_UBOOT_NEEDS_OPENSSL.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot