Commit d831f249 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

Fix fallout after generated defconfig support 



Fix improper use of qstrip; use correct variables.

Fixes #8546.

Reported-by: default avatar <craigswank@gmail.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b8d2e3b5

boot/at91bootstrap3/at91bootstrap3.mk

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y) 
# We must use the user-supplied kconfig value, because

# AT91BOOTSTRAP3_KCONFIG_DEFCONFIG will at least contain

# the trailing _defconfig

ifeq ($(AT91BOOTSTRAP3_KCONFIG_DEFCONFIG),)

ifeq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG)),)

$(error No at91bootstrap3 defconfig name specified, check your BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG setting)

endif

endif

boot/barebox/barebox.mk

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ ifeq ($(BR2_TARGET_BAREBOX)$(BR_BUILDING),yy) 
# We must use the user-supplied kconfig value, because

# BAREBOX_KCONFIG_DEFCONFIG will at least contain the

# trailing _defconfig

ifeq ($(or $(BAREBOX_KCONFIG_FILE),$(BAREBOX_KCONFIG_DEFCONFIG)),)

ifeq ($(or $(BAREBOX_KCONFIG_FILE),$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))),)

$(error No Barebox config. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings)

endif

endif

linux/linux.mk

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) 
# We must use the user-supplied kconfig value, because

# LINUX_KCONFIG_DEFCONFIG will at least contain the

# trailing _defconfig

ifeq ($(qstrip $(BR2_LINUX_KERNEL_DEFCONFIG)),)

ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)

$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)

endif

endif