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 <cnsztl@immortalwrt.org>

diff --git a/include/u-boot.mk b/include/u-boot.mk
index 06867a70e426b6b0807b167619c9d2975cf774d2..454880989b5ec066542ef7f23a4580104c8423c2 100644 (file)
--- 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 cc84d5d4ab2e006c9a05395d092ea6312e70fd52..c9b3bbd3ac1f2af00f000fb6d6909760c8b2d20b 100644 (file)
--- 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))