mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
boot/uboot: fix uboot building host tools on x86 architecture
The make all command run the tools/makefile on the process.
This makefile use "pkg-config" command to support static link.
The issue is the use of pkg-config configured for crosscompiling
to build binaries tools for host architecture.
To fix it, I add pkg-config environment variable to configure it for host.
Add a test to avoid future regress on the build of U-boot.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
[yann.morin.1998@free.fr:
- fix mixed space-TAB indentation
- fix check-package
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 2eaa6d0f36)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
d8887c5c58
commit
e0b7a279bd
@@ -307,6 +307,11 @@ define UBOOT_BUILD_CMDS
|
|||||||
cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
|
cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
|
||||||
)
|
)
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||||
|
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||||
|
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
|
||||||
|
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
|
||||||
|
PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" \
|
||||||
$(UBOOT_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
|
$(UBOOT_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
|
||||||
$(UBOOT_MAKE_TARGET)
|
$(UBOOT_MAKE_TARGET)
|
||||||
$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
|
$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
import infra.basetest
|
||||||
|
|
||||||
|
|
||||||
|
class TestUbootOpensslPkgConfig(infra.basetest.BRTest):
|
||||||
|
config = infra.basetest.MINIMAL_CONFIG + \
|
||||||
|
"""
|
||||||
|
BR2_x86_64=y
|
||||||
|
BR2_x86_atom=y
|
||||||
|
BR2_PACKAGE_OPENSSL=y
|
||||||
|
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):
|
||||||
|
img = os.path.join(self.builddir, "images", "u-boot.bin")
|
||||||
|
self.assertTrue(os.path.exists(img))
|
||||||
Reference in New Issue
Block a user