Skip to contentSkip to conversation

infra: relax the check on BR2_TOOLCHAIN_BUILDROOT_VENDOR

PATCH New Arnout Vandecappelle (Essensium/Mind) 3 participants 4 messages May 6, 2014

lore
Share & tools
lore

Arnout Vandecappelle (Essensium/Mind)

author
#0 lore raw

PATCH 1/1 infra: relax the check on BR2_TOOLCHAIN_BUILDROOT_VENDOR

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) <[email protected]>
---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/Makefile.in +3 -1
index c34a3bf..da8b768 100644
@@ -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)
Signature · 1 line
2.0.0.rc0
#1 lore raw

PATCH 1/1 infra: relax the check on BR2_TOOLCHAIN_BUILDROOT_VENDOR

Dear Arnout Vandecappelle (Essensium/Mind),

Quoted 18 lines · Arnout Vandecappelle (Essensium/Mind)

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) <[email protected]>
---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/Makefile.in +0 -0
index c34a3bf..da8b768 100644

package/Makefile.in else · line 30

Quoted 6 lines
package/Makefile.in +2 -1
@@ -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)),)

What about using $(noconfig_targets) here, like is done in the main Makefile?

Thomas

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

PATCH 1/1 infra: relax the check on BR2_TOOLCHAIN_BUILDROOT_VENDOR

Quoted 25 lines · Thomas Petazzoni

Dear Arnout Vandecappelle (Essensium/Mind),

Quoted 21 lines · Arnout Vandecappelle (Essensium/Mind)

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) <[email protected]>
---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/Makefile.in +0 -0
index c34a3bf..da8b768 100644
@@ -26,7 +26,8 @@ else
 TARGET_VENDOR = buildroot
 endif
Quoted 6 lines

package/Makefile.in else · line 30

Quoted 3 lines
package/Makefile.in +2 -1
-# Sanity checks
+# Sanity checks - but not when we try to reconfigure
+ifeq ($(filter menuconfig xconfig gconfig nconfig config defconfig oldconfig silentoldconfig %_defconfig,$(MAKECMDGOALS)),)

What about using $(noconfig_targets) here, like is done in the main Makefile?

D'oh, silly me. This patch is not necessary.

I still have http://patchwork.ozlabs.org/patch/316667/ rebased on top of
master, and that patch reads .config even for the *config targets.

So I've marked this patch as Not Applicable in patchwork.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#3 lore raw

PATCH 1/1 infra: relax the check on BR2_TOOLCHAIN_BUILDROOT_VENDOR

Quoted 11 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

What about using $(noconfig_targets) here, like is done in the main Makefile?

D'oh, silly me. This patch is not necessary.

I still have http://patchwork.ozlabs.org/patch/316667/ rebased on top of
master, and that patch reads .config even for the *config targets.

So I've marked this patch as Not Applicable in patchwork.

Ahh, ok. I wondered why I hadn't hit this issue myself.

Signature · 1 line
Bye, Peter Korsgaard