use the new concept of appliances

- Sync with Kernel upstream Kconfig
- use new feature visible
- add a patch for select on choices
  https://lkml.org/lkml/2011/2/17/379
- rename ADK_LINUX -> ADK_TARGET_ARCH
- remove package collection feature
- add appliance feature to define a appliance
  more complete

1 files changed, 15 insertions, 27 deletions

diff --git a/scripts/create-menu b/scripts/create-menu
index 573daadb5..94698e8d1 100755
--- a/scripts/create-menu
+++ b/scripts/create-menu
@@ -6,16 +6,22 @@ topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd
 systems=$(grep -h config target/*/systems/*|cut -d " " -f 2)
 
 printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.arch
-printf "source target/config/Config.in.arch.default\n" > target/config/Config.in.arch
+printf "source target/config/Config.in.arch.default\n" >> target/config/Config.in.arch
 printf "source target/config/Config.in.arch.choice\n" >> target/config/Config.in.arch
 printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.system
 printf "source target/config/Config.in.system.default\n" >> target/config/Config.in.system
 printf "source target/config/Config.in.system.choice\n" >> target/config/Config.in.system
 
-# update package collection
-if [ -d "$topdir/target/collections" ];then
-	printf "# autogenerated via scripts/create-menu\n" > $topdir/package/Config.in.collections
-	cat $topdir/target/collections/* >> $topdir/package/Config.in.collections 2>/dev/null
+# update appliances
+if [ -d "$topdir/target/appliances" ];then
+	printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.appliances
+	printf "choice\n" >> $topdir/target/config/Config.in.appliances
+	printf "prompt \"Appliance\"\n\n" >> $topdir/target/config/Config.in.appliances
+	printf "config ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances
+	printf "\tprompt \"choose an appliance\"\n" >> $topdir/target/config/Config.in.appliances
+	printf "\tboolean\n\n" >> $topdir/target/config/Config.in.appliances
+	cat $topdir/target/appliances/* >> $topdir/target/config/Config.in.appliances 2>/dev/null
+	printf "\nendchoice\n" >> $topdir/target/config/Config.in.appliances
 fi
 
 # create system default
@@ -52,10 +58,8 @@ printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.arc
 for arch in $(cat $topdir/target/arch.lst);do
 	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
 	printf "choice\n" > $topdir/target/$arch/Config.in.arch
-	printf "depends on ADK_LINUX_$ARCH && !ADK_CHOOSE_TARGET_ARCH\n" >> $topdir/target/$arch/Config.in.arch
-	printf "prompt \"Target system\"\n\n" >> $topdir/target/$arch/Config.in.arch
-	printf "config ADK_CHOOSE_TARGET_SYSTEM_$ARCH\n" >> $topdir/target/$arch/Config.in.arch
-	printf "\tboolean \"Choose target system\"\n\n" >> $topdir/target/$arch/Config.in.arch
+	printf "prompt \"Embedded system\"\n" >> $topdir/target/$arch/Config.in.arch
+	printf "depends on ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/$arch/Config.in.arch
 	printf "source target/$arch/Config.in.systems\n" >> $topdir/target/$arch/Config.in.arch
 	printf "endchoice\n" >> $topdir/target/$arch/Config.in.arch
 	printf "source target/$arch/Config.in.arch\n" >> target/config/Config.in.system.choice
@@ -75,16 +79,13 @@ done
 cat > $topdir/target/config/Config.in.arch.choice << EOD
 # autogenerated via scripts/create-menu
 choice
-prompt "Target architecture"
-
-config ADK_CHOOSE_TARGET_ARCH
-	bool "Choose target architecture"
+prompt "Architecture"
 
 EOD
 
 for arch in $(cat $topdir/target/arch.lst);do
 	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
-	printf "config ADK_LINUX_$ARCH\n" >> $topdir/target/config/Config.in.arch.choice
+	printf "config ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/config/Config.in.arch.choice
 	printf "\tprompt \"$arch system\"\n" >> $topdir/target/config/Config.in.arch.choice
 	printf "\tboolean\n" >> $topdir/target/config/Config.in.arch.choice
 	printf "\tselect ADK_$arch\n" >> $topdir/target/config/Config.in.arch.choice
@@ -93,17 +94,4 @@ for arch in $(cat $topdir/target/arch.lst);do
 done
 
 printf "endchoice\n" >> $topdir/target/config/Config.in.arch.choice
-
-cat > $topdir/target/config/Config.in.system.choose << EOD
-# autogenerated via scripts/create-menu
-config ADK_CHOOSE_TARGET_SYSTEM
-	boolean
-EOD
-
-for arch in $(cat $topdir/target/arch.lst);do
-	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
-	printf "\tdefault y if ADK_CHOOSE_TARGET_SYSTEM_$ARCH\n" >> $topdir/target/config/Config.in.system.choose
-done
-printf "\tdefault n\n" >> $topdir/target/config/Config.in.system.choose
-
 exit 0