Merge pull request #4818 from dhewg/crust-fixup

fix warnings with unset UBOOT_SYSTEM
This commit is contained in:
Matthias Reichl 2021-01-01 23:46:19 +01:00 committed by GitHub
commit afeb291cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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"