From 4f668091bfd608b73f4b98b206358d8f1a7ffade Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 25 Feb 2024 20:33:08 +0800 Subject: [PATCH] u-boot.mk: override default PATH to avoid pick hostpkg python hostpkg python from packages feed can be picked when do a incremental build because hostpkg has higher priority in PATH. It may lead build faliure as it's heavily trimmed (e.g. lacks necessary modules). For uboot which uses binman and intree dtc, this is forced as hostpkg python will never provide those modules by default. Signed-off-by: Tianling Shen --- include/u-boot.mk | 1 + package/boot/uboot-rockchip/Makefile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/u-boot.mk b/include/u-boot.mk index 06867a70e426..454880989b5e 100644 --- a/include/u-boot.mk +++ b/include/u-boot.mk @@ -69,6 +69,7 @@ endef TARGET_DEP = TARGET_$(BUILD_TARGET)$(if $(BUILD_SUBTARGET),_$(BUILD_SUBTARGET)) UBOOT_MAKE_FLAGS = \ + PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \ HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index cc84d5d4ab2e..c9b3bbd3ac1f 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -190,7 +190,6 @@ UBOOT_CUSTOMIZE_CONFIG := \ --set-str MKIMAGE_DTC_PATH $(PKG_BUILD_DIR)/scripts/dtc/dtc UBOOT_MAKE_FLAGS += \ - PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \ BL31=$(STAGING_DIR_IMAGE)/$(ATF) \ $(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL)) -- 2.30.2