From d831f2496441b5454de6a6dc0b4abb3804b94c88 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 23 Dec 2015 09:37:36 +0100 Subject: [PATCH] Fix fallout after generated defconfig support Fix improper use of qstrip; use correct variables. Fixes #8546. Reported-by: craigswank@gmail.com Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap3/at91bootstrap3.mk | 2 +- boot/barebox/barebox.mk | 2 +- linux/linux.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index 0f5d3bdb9c..32732f4758 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -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 diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index f36ca70f6e..7715dafe61 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -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 diff --git a/linux/linux.mk b/linux/linux.mk index 06a27ebed2..69a09aa206 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -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 -- 2.30.2