[Buildroot] [PATCH] infra: relax the check on BR2_TOOLCHAIN_BUILDROOT_VENDOR

Arnout Vandecappelle (Essensium/Mind) arnout at mind.be
Tue May 6 16:27:47 UTC 2014


65c2400f introduced BR2_TOOLCHAIN_BUILDROOT_VENDOR and a check that it
is not empty or 'unknown'. However, when a .config file from before
that commit exists, this makes it impossible to run *config in order
to set a value. Catch-22.

To break the cycle, remove the check when running one of the config
targets.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index c34a3bf..da8b768 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -26,7 +26,8 @@ else
 TARGET_VENDOR = buildroot
 endif
 
-# Sanity checks
+# Sanity checks - but not when we try to reconfigure
+ifeq ($(filter menuconfig xconfig gconfig nconfig config defconfig oldconfig silentoldconfig %_defconfig,$(MAKECMDGOALS)),)
 ifeq ($(TARGET_VENDOR),)
 $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR is not allowed to be empty)
 endif
@@ -34,6 +35,7 @@ ifeq ($(TARGET_VENDOR),unknown)
 $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \
         It might be confused with the native toolchain)
 endif
+endif # not a config target
 
 # Compute GNU_TARGET_NAME
 GNU_TARGET_NAME=$(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI)
-- 
2.0.0.rc0



More information about the buildroot mailing list