From 669f85502f057e8f7132238b1200eda78a3013b3 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Thu, 31 Dec 2020 11:55:07 +0100 Subject: [PATCH 1/2] linux: fix warnings with unset UBOOT_SYSTEM --- packages/linux/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7bc1a1f984..9e6350d5fe 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -30,9 +30,10 @@ case "$LINUX" in esac PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die - -if [ -n "$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)" ]; then +if [ -n "$UBOOT_SYSTEM" ]; then + if [ -n "$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)" ]; then PKG_PATCH_DIRS="$PKG_PATCH_DIRS crust" + fi fi if [ -n "$KERNEL_TOOLCHAIN" ]; then From f7bbe3903f6a962f1c4c08e69d29d00727520a04 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Thu, 31 Dec 2020 11:56:03 +0100 Subject: [PATCH 2/2] u-boot: fix warnings with unset UBOOT_SYSTEM --- packages/tools/u-boot/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 54c791a951..62b05c38dc 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -18,7 +18,8 @@ if [ -n "$UBOOT_FIRMWARE" ]; then PKG_DEPENDS_UNPACK+=" $UBOOT_FIRMWARE" fi -CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config) +CRUST_CONFIG="" +[ -n "$UBOOT_SYSTEM" ] && CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config) [ -n "$CRUST_CONFIG" ] && PKG_DEPENDS_TARGET+=" crust" PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"