changed packageslists, added "--kanotix-flavours"

3 files changed, 27 insertions, 1 deletions

diff --git a/auto/build b/auto/build
index b54183c..62e8d8b 100755
--- a/auto/build
+++ b/auto/build
@@ -30,11 +30,21 @@ prebuild()
 	# make current build configuration available for hooks inside chroot
 	mkdir -p config/chroot_local-includes/root
 	cat config/* 2>/dev/null | grep ^LH_ > config/chroot_local-includes/root/build.conf
+
+        # Kanotix flavours
+        if [ "$LH_KANOTIX_FLAVOURS" -a "$LH_KANOTIX_FLAVOURS" != "none" ]; then
+                echo "# DO NOT EDIT THIS FILE! It is auto-generated and will be deleted/ overwritten!" > config/chroot_local-packageslists/kanotix-flavours.list
+                for FLAVOUR in $LH_KANOTIX_FLAVOURS
+                do
+                        echo "#include <$FLAVOUR>" >> config/chroot_local-packageslists/kanotix-flavours.list
+                done
+        fi
 }
 
 postbuild()
 {
 	rm -f config/chroot_local-includes/root/build.conf
+        rm -f config/chroot_local-packageslists/kanotix-flavours.list
 }
 
 if [ "$LH_KANOTIX_TMPFS" = "true" ]; then
diff --git a/auto/clean b/auto/clean
index 6fabe4a..fa41233 100755
--- a/auto/clean
+++ b/auto/clean
@@ -3,7 +3,8 @@
 rm -f build.log
 
 # Remove generated files
-rm -f config/binary config/bootstrap config/chroot config/common config/source config/kanotix config/chroot_local-includes/root/build.conf
+rm -f config/binary config/bootstrap config/chroot config/common config/source \
+      config/kanotix config/chroot_local-includes/root/build.conf config/chroot_local-packageslists/kanotix-flavours.list
 if [ -f config/all ]; then
 	sed -i '/^. config\/kanotix/d' config/all
 	[ ! -s config/all ] && rm -f config/all
diff --git a/auto/kanotix b/auto/kanotix
index ac6ec48..fb0aed3 100755
--- a/auto/kanotix
+++ b/auto/kanotix
@@ -7,6 +7,7 @@ usage()
 cat <<eof
 
 Additional Options for Kanotix:
+            [--kanotix-flavours FLAVOUR|"FLAVOURS"]
 	    [--include-nvidia true|false]
 	    [--tmpfs true|false]
 	    [--tmpfs-options OPTIONS]
@@ -16,6 +17,7 @@ eof
 
 write_kanotix_config()
 {
+[ -z "${LH_KANOTIX_FLAVOURS}" ] && LH_KANOTIX_FLAVOURS="kanotix-master"
 [ -z "${LH_KANOTIX_NVIDIA}" ] && LH_KANOTIX_NVIDIA="true"
 [ -z "${LH_KANOTIX_TMPFS}" ] && [ -d tmpfs ] && LH_KANOTIX_TMPFS="true"
 [ -z "${LH_KANOTIX_TMPFS}" ] && LH_KANOTIX_TMPFS="false"
@@ -24,6 +26,10 @@ write_kanotix_config()
 cat >config/kanotix << EOF
 # config/kanotix - additional options for Kanotix
 
+# \$LH_KANOTIX_FLAVOURS: select Kanotix-packageslists
+# (Default: kanotix-master)
+LH_KANOTIX_FLAVOURS="${LH_KANOTIX_FLAVOURS}"
+
 # \$LH_KANOTIX_NVIDIA: include NVidia-Drivers into chroot
 # (Default: ${LH_KANOTIX_NVIDIA})
 LH_KANOTIX_NVIDIA="${LH_KANOTIX_NVIDIA}"
@@ -45,6 +51,15 @@ unset args; i=1
 while [ "$1" ]
 do
         case "$1" in
+        --kanotix-flavour*)
+                LH_KANOTIX_FLAVOURS="$2"
+                shift
+                while [ "$2" -a "${2:0:1}" != "-" ]
+                do
+                        LH_KANOTIX_FLAVOURS="$LH_KANOTIX_FLAVOURS $2"
+                        shift
+                done
+                ;;
 	--include-nvidia)
 		LH_KANOTIX_NVIDIA="$2"
 		shift