summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-11-18 20:03:49 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-11-18 20:04:55 +0100
commit5c39825cf30a919b18ad1370488703576a1b9d09 (patch)
treee101a7a387cac08d5664f74a19aa96ec22346224
parent9a1a3bb63dbec16ddd946c557574bdfc7386d24b (diff)
downloadptxdist-5c39825cf30a919b18ad1370488703576a1b9d09.tar.gz
ptxdist-5c39825cf30a919b18ad1370488703576a1b9d09.tar.xz
[collection] generate valid kconfig files for "ptxdist collectionconfig"
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--config/collection/Kconfig23
-rw-r--r--scripts/lib/ptxd_lib_colgen.sh19
2 files changed, 20 insertions, 22 deletions
diff --git a/config/collection/Kconfig b/config/collection/Kconfig
index 315658491..e34ae561b 100644
--- a/config/collection/Kconfig
+++ b/config/collection/Kconfig
@@ -9,12 +9,23 @@ config _collectionconfig_MAGIC__
bool
default y
-menuconfig COLLECTION
- bool "select optional packages "
- depends on !COLLECTION_ALL
+choice
+ prompt "select packages"
+ default COLLECTION_MANUAL
+
+config COLLECTION_NONE
+ tristate
+ prompt "none "
+
+config COLLECTION_MANUAL
+ tristate
+ prompt "manual"
+
+config COLLECTION_ALL
+ tristate
+ prompt "all "
+
+endchoice
-if COLLECTION
source "generated/ptx_collection.in"
-endif
-source "generated/ptx_collection_all.in"
diff --git a/scripts/lib/ptxd_lib_colgen.sh b/scripts/lib/ptxd_lib_colgen.sh
index 330ef4706..7691e430f 100644
--- a/scripts/lib/ptxd_lib_colgen.sh
+++ b/scripts/lib/ptxd_lib_colgen.sh
@@ -11,7 +11,6 @@ ptxd_colgen_generate_sections()
BEGIN {
FS = "=\"|\"|=";
col_in = "'"${PTX_KGEN_DIR}"'" "/collection/ptx_collection.in";
- col_all_in = "'"${PTX_KGEN_DIR}"'" "/collection/ptx_collection_all.in";
}
$1 ~ /^PTX_MAP_TO_package/ {
@@ -41,20 +40,6 @@ ptxd_colgen_generate_sections()
END {
n = asorti(module_pkgs, sorted);
- printf \
- "config COLLECTION_ALL\n"\
- "\t" "bool \"select all packages \"\n" > col_all_in;
-
-
- for (i = 1; i <= n; i++) {
- pkg = sorted[i];
-
- print "\tselect " pkg > col_all_in;
- }
-
- printf "\n" > col_all_in;
- close(col_all_in);
-
printf "" > col_in;
for (i = 1; i <= n; i++) {
@@ -63,7 +48,9 @@ ptxd_colgen_generate_sections()
printf \
"config " pkg "\n"\
- "\t" "bool \"" pkg_lc "\"\n" > col_in;
+ "\t" "bool\n"\
+ "\t" "prompt \"" pkg_lc "\" if COLLECTION_MANUAL\n"\
+ "\t" "default COLLECTION_ALL\n" > col_in;
m = split(deps[pkg], dep, ":");
for (j = 1; j <= m; j++) {