changed packageslists, added "--kanotix-flavours"

13 files changed, 113 insertions, 44 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
diff --git a/config/chroot_local-packageslists/acritox.list.disabled b/config/chroot_local-packageslists/acritox
index 6b6003b..a95b8f4 100644
--- a/config/chroot_local-packageslists/acritox.list.disabled
+++ b/config/chroot_local-packageslists/acritox
@@ -1,5 +1,4 @@
 # acritox' extra packages list
-# rename to acritox.list to enable
 
 # development
 dput
@@ -16,7 +15,6 @@ smbfs
 beep
 
 # hardware
-bluetooth
 powertop
 
 # latex
@@ -54,7 +52,3 @@ kdeplasma-addons
 google-gadgets-qt
 plasma-scriptengine-googlegadgets
 
-# 3rd party
-#nxclient
-#picasa
-
diff --git a/config/chroot_local-packageslists/kanotix.list b/config/chroot_local-packageslists/base
index 2dfd381..51794b4 100644
--- a/config/chroot_local-packageslists/kanotix.list
+++ b/config/chroot_local-packageslists/base
@@ -1,31 +1,22 @@
-# Kanotix Packages List
+# Kanotix base Packages List
 
 #if ARCHITECTURE i386
-#include <kanotix.i386>
+#include <base.i386>
 #endif
 
 #if ARCHITECTURE amd64
-#include <kanotix.amd64>
+#include <base.amd64>
 #endif
 
-# Kanotix base packages list
+#include <firmware>
 
 # office
-okular
 myspell-de-de
 
-# wine, java, plugins
-konqueror-nsplugins
+# java, plugins
 sun-java6-plugin
-wine
-wine-gecko
 
 # multimedia
-kaffeine
-libsdl1.2debian-alsa
-amarok
-kdemultimedia-kio-plugins
-kamera
 sox
 alsa-oss
 aumix
@@ -33,9 +24,6 @@ smplayer
 dvdauthor
 
 # burn
-k3b
-k3b-i18n
-libk3b6-extracodecs
 normalize-audio
 dvd+rw-tools
 
@@ -48,7 +36,6 @@ pidgin
 gstreamer0.10-plugins-base
 gstreamer0.10-plugins-good
 weechat
-konversation
 kanotix-irc
 
 # skype
@@ -63,18 +50,15 @@ xsane
 libsane-extras
 sane-utils
 sane
-gwenview
 
 # editors
 vim
-kate
 
 # archive
 unrar
 unzip
 zip
 unp
-ark
 
 # tools
 mc
@@ -106,25 +90,13 @@ whois
 infobash
 
 # tools (GUI)
-ksnapshot
-kcalc
-kuser
 synaptic
 screentube
 
-# kde
-kdebase
-kdm
-kde-i18n-de
-kwalletmanager
-kmix
-
 # themes
 gtk2-engines
-kde-config-gtk-style
 
 # network
-network-manager-kde
 pcmciautils
 openssh-client
 sshfs
@@ -161,16 +133,15 @@ devscripts
 pbuilder
 
 # kanotix
-kanotix-menu
-etcskel-kanotix
 user-profile-kanotix
 #kanotix-graphics
 grub2-splashimage-kanotix-penguins
 kanotix-scripts
 kanotix-toolkit
-acritoxinstaller-kanotix
 
 # system
+cpufrequtils
+acpi
 acpid
 sysv-freeze
 xdg-utils
@@ -227,5 +198,4 @@ radeontool
 modemmanager
 umtsmon
 wacom-tools
-kde-config-touchpad
 
diff --git a/config/chroot_local-packageslists/kanotix.amd64 b/config/chroot_local-packageslists/base.amd64
index 30b5c74..30b5c74 100644
--- a/config/chroot_local-packageslists/kanotix.amd64
+++ b/config/chroot_local-packageslists/base.amd64
diff --git a/config/chroot_local-packageslists/kanotix.i386 b/config/chroot_local-packageslists/base.i386
index 9909de1..9909de1 100644
--- a/config/chroot_local-packageslists/kanotix.i386
+++ b/config/chroot_local-packageslists/base.i386
diff --git a/config/chroot_local-packageslists/firmware.list b/config/chroot_local-packageslists/firmware
index b14a864..b14a864 100644
--- a/config/chroot_local-packageslists/firmware.list
+++ b/config/chroot_local-packageslists/firmware
diff --git a/config/chroot_local-packageslists/kanotix-full b/config/chroot_local-packageslists/kanotix-full
new file mode 100644
index 0000000..4c34fbc
--- /dev/null
+++ b/config/chroot_local-packageslists/kanotix-full
@@ -0,0 +1,5 @@
+# Kanotix Full
+
+#include <kanotix-master>
+#include <acritox>
+
diff --git a/config/chroot_local-packageslists/kanotix-lite b/config/chroot_local-packageslists/kanotix-lite
new file mode 100644
index 0000000..22f7bef
--- /dev/null
+++ b/config/chroot_local-packageslists/kanotix-lite
@@ -0,0 +1,5 @@
+# Kanotix Lite
+
+#include <base>
+#include <kde>
+
diff --git a/config/chroot_local-packageslists/kanotix-master b/config/chroot_local-packageslists/kanotix-master
new file mode 100644
index 0000000..2727c8e
--- /dev/null
+++ b/config/chroot_local-packageslists/kanotix-master
@@ -0,0 +1,10 @@
+# Kanotix
+
+#include <base>
+#include <kde>
+#include <office>
+
+# wine
+wine
+wine-gecko
+
diff --git a/config/chroot_local-packageslists/kde b/config/chroot_local-packageslists/kde
new file mode 100644
index 0000000..519d93e
--- /dev/null
+++ b/config/chroot_local-packageslists/kde
@@ -0,0 +1,59 @@
+# Kanotix additional packages list for kde
+
+# office
+okular
+
+# plugins
+konqueror-nsplugins
+
+# multimedia
+kaffeine
+libsdl1.2debian-alsa
+amarok
+kdemultimedia-kio-plugins
+kamera
+
+# burn
+k3b
+k3b-i18n
+libk3b6-extracodecs
+
+# chat, irc
+konversation
+
+# graphics
+gwenview
+
+# editors
+kate
+
+# archive
+ark
+
+# tools
+ksnapshot
+kcalc
+kuser
+
+# kde
+kdebase
+kdm
+kde-i18n-de
+kwalletmanager
+kmix
+
+# themes
+kde-config-gtk-style
+
+# network
+network-manager-kde
+
+# kanotix
+kanotix-menu
+etcskel-kanotix
+#kanotix-graphics
+acritoxinstaller-kanotix
+
+# other hardware
+kde-config-touchpad
+
diff --git a/config/chroot_local-packageslists/openoffice.list.disabled b/config/chroot_local-packageslists/office
index e998500..e998500 100644
--- a/config/chroot_local-packageslists/openoffice.list.disabled
+++ b/config/chroot_local-packageslists/office