Skip to contentSkip to conversation

boot/uboot: add missing dependency to host-pkgconf

PATCH New Yann E. MORIN 2 participants 3 messages Jul 15, 2021 – Aug 3, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 boot/uboot: add missing dependency to host-pkgconf

Commit 2eaa6d0f3629 (boot/uboot: fix uboot building host tools on x86 architecture) added use of $(PKG_CONFIG_HOST_BINARY), but forgot to add the corresponding build-ordr dependency.

Add this missing depenency now.

Additionally, the associated test had an explicit host pkgconf enbled in its configuration. This is superfluous now that uboot properly depends on host-pkgconf, so drop that from the test.

Note: it hapenned to work, because host-pkgconf, when explicitly enabled in the configuration, and without per-package directories, would build before uboot and thus be available. This would fail with PPD, though, and thus would break for TLPB.

---
 boot/uboot/uboot.mk                                           | 2 +-
 support/testing/tests/package/test_uboot_openssl_pkgconfig.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
boot/uboot/uboot.mk +1 -1
index a7eaedb06f..a8a8bedc01 100644
@@ -17,7 +17,7 @@ UBOOT_CPE_ID_PRODUCT = u-boot
 UBOOT_INSTALL_IMAGES = YES
 
 # u-boot 2020.01+ needs make 4.0+
-UBOOT_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY)
+UBOOT_DEPENDENCIES = host-pkgconf $(BR2_MAKE_HOST_DEPENDENCY)
 UBOOT_MAKE = $(BR2_MAKE)
 
 ifeq ($(UBOOT_VERSION),custom)
support/testing/tests/package/test_uboot_openssl_pkgconfig.py +0 -1
index de2d83f5b8..55a45f44fc 100644
@@ -12,7 +12,6 @@ class TestUbootOpensslPkgConfig(infra.basetest.BRTest):
         BR2_TARGET_UBOOT=y
         BR2_TARGET_UBOOT_BOARD_DEFCONFIG="efi-x86_payload64"
         BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-        BR2_PACKAGE_HOST_PKGCONF=y
         """
 
     def test_run(self):
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 boot/uboot: add missing dependency to host-pkgconf

Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Commit 2eaa6d0f3629 (boot/uboot: fix uboot building host tools on x86 architecture) added use of $(PKG_CONFIG_HOST_BINARY), but forgot to add the corresponding build-ordr dependency.

Add this missing depenency now.

Additionally, the associated test had an explicit host pkgconf enbled in its configuration. This is superfluous now that uboot properly depends on host-pkgconf, so drop that from the test.

Quoted 8 lines

Note: it hapenned to work, because host-pkgconf, when explicitly enabled in the configuration, and without per-package directories, would build before uboot and thus be available. This would fail with PPD, though, and thus would break for TLPB.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw
Quoted 18 lines
Quoted 17 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Yann" == Yann E MORIN <[email protected]> writes:

Commit 2eaa6d0f3629 (boot/uboot: fix uboot building host tools on x86 architecture) added use of $(PKG_CONFIG_HOST_BINARY), but forgot to add the corresponding build-ordr dependency.

Add this missing depenency now.

Additionally, the associated test had an explicit host pkgconf enbled in its configuration. This is superfluous now that uboot properly depends on host-pkgconf, so drop that from the test.

Note: it hapenned to work, because host-pkgconf, when explicitly enabled in the configuration, and without per-package directories, would build before uboot and thus be available. This would fail with PPD, though, and thus would break for TLPB.

Quoted 5 lines
Quoted 3 lines

Committed, thanks.

Committed to 2021.02.x and 2021.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot