[Balloon-svn] r1873 - balloon/branches/menuconfig2

Author: nick
Date: 2012-05-08 16:49:50 +0100 (Tue, 08 May 2012)
New Revision: 1873

Modified:
balloon/branches/menuconfig2/Config.in
balloon/branches/menuconfig2/Makefile.in
Log:
add subvariant support at top level

Modified: balloon/branches/menuconfig2/Config.in
===================================================================
--- balloon/branches/menuconfig2/Config.in    2012-05-08 15:49:22 UTC (rev 1872)
+++ balloon/branches/menuconfig2/Config.in    2012-05-08 15:49:50 UTC (rev 1873)
@@ -124,6 +124,15 @@

endchoice

+config BR2_USE_SUBVARIANT
+    bool "Specify a named subvariant"
+    default n
+
+config BR2_SUBVARIANT
+    depends on BR2_USE_SUBVARIANT
+    string "Subvariant name"
+    default ""
+
 config BR2_MAKE_JOBS
     int "Number of simultaneous jobs a 'make' can launch (max 8)"
     default 1

Modified: balloon/branches/menuconfig2/Makefile.in
===================================================================
--- balloon/branches/menuconfig2/Makefile.in    2012-05-08 15:49:22 UTC (rev 1872)
+++ balloon/branches/menuconfig2/Makefile.in    2012-05-08 15:49:50 UTC (rev 1873)
@@ -64,7 +64,14 @@
 VARIANT:=-specs
 endif

+ifeq ($(BR2_USE_SUBVARIANT),y)
+ifneq ($(BR2_SUBVARIANT),"")
+SUBVARIANT=$(BR2_SUBVARIANT)
+endif
+endif
+
export VARIANT
+export SUBVARIANT

export FAKEROOT=`if [ -z $$FAKEROOTKEY ]; then echo "fakeroot -i $(BUILD)/fakerootstate -s $(BUILD)/fakerootstate"; fi;`

@@ -82,5 +89,8 @@
#
#CONFIG_TARGETS:=board_variant

+# utility to remove double quotes and whitespace
+qstrip=$(strip $(subst ",,$(1)))
+
# include the package makefiles
include $(PACKAGEDIR)/Makefile.in