Skip to contentSkip to conversation

Fix fallout after generated defconfig support

PATCH New Yann E. MORIN 2 participants 2 messages Dec 23, 2015 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix fallout after generated defconfig support

Fix improper use of qstrip; use correct variables.

Fixes #8546.

Reported-by craigswank at gmail.com
Cc Thomas Petazzoni <[email protected]>

---
Thomas,

I did that patch in quite a rush this morning, but it's quite a critical topic so I just send it as-is, after just a very brief testing here. Please re-test it on your side. Thanks!

Yann.

---
 boot/at91bootstrap3/at91bootstrap3.mk | 2 +-
 boot/barebox/barebox.mk               | 2 +-
 linux/linux.mk                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
boot/at91bootstrap3/at91bootstrap3.mk +1 -1
index 0f5d3bd..32732f4 100644
@@ -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
index f36ca70..7715daf 100644
@@ -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
index 06a27eb..69a09aa 100644
@@ -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
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 Fix fallout after generated defconfig support

Dear Yann E. MORIN,

Quoted 10 lines · Yann E. MORIN

Fix improper use of qstrip; use correct variables.

Fixes #8546.

Reported-by craigswank at gmail.com
Cc Thomas Petazzoni <[email protected]>

---
Thomas,

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com