From 8b562b1f619fc5465b1de03eaca0cc2a8828eabb Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Mon, 22 Nov 2010 10:52:05 +0100
Subject: use --package-lists instead of --kanotix-flavours
---
auto/config | 4 +-
auto/kanotix | 15 --
config/chroot_local-packageslists/acritox | 68 --------
config/chroot_local-packageslists/base | 201 ----------------------
config/chroot_local-packageslists/base.amd64 | 3 -
config/chroot_local-packageslists/base.i386 | 2 -
config/chroot_local-packageslists/firmware | 13 --
config/chroot_local-packageslists/kanotix-full | 12 --
config/chroot_local-packageslists/kanotix-lite | 5 -
config/chroot_local-packageslists/kanotix-master | 20 ---
config/chroot_local-packageslists/kde | 61 -------
config/chroot_local-packageslists/office | 12 --
config/lists/acritox | 68 ++++++++
config/lists/base | 202 +++++++++++++++++++++++
config/lists/base.amd64 | 3 +
config/lists/base.i386 | 2 +
config/lists/firmware | 13 ++
config/lists/kanotix-full | 12 ++
config/lists/kanotix-lite | 5 +
config/lists/kanotix-master | 20 +++
config/lists/kde | 61 +++++++
config/lists/office | 12 ++
22 files changed, 401 insertions(+), 413 deletions(-)
delete mode 100644 config/chroot_local-packageslists/acritox
delete mode 100644 config/chroot_local-packageslists/base
delete mode 100644 config/chroot_local-packageslists/base.amd64
delete mode 100644 config/chroot_local-packageslists/base.i386
delete mode 100644 config/chroot_local-packageslists/firmware
delete mode 100644 config/chroot_local-packageslists/kanotix-full
delete mode 100644 config/chroot_local-packageslists/kanotix-lite
delete mode 100644 config/chroot_local-packageslists/kanotix-master
delete mode 100644 config/chroot_local-packageslists/kde
delete mode 100644 config/chroot_local-packageslists/office
create mode 100644 config/lists/acritox
create mode 100644 config/lists/base
create mode 100644 config/lists/base.amd64
create mode 100644 config/lists/base.i386
create mode 100644 config/lists/firmware
create mode 100644 config/lists/kanotix-full
create mode 100644 config/lists/kanotix-lite
create mode 100644 config/lists/kanotix-master
create mode 100644 config/lists/kde
create mode 100644 config/lists/office
diff --git a/auto/config b/auto/config
index 0b7ed72..008ef18 100755
--- a/auto/config
+++ b/auto/config
@@ -8,6 +8,9 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT"
. auto/kanotix
+# preset default packages list
+export LB_PACKAGES_LISTS="kanotix-master"
+
lb config noauto \
--iso-volume KANOTIX \
--iso-preparer kanotix.com \
@@ -33,7 +36,6 @@ lb config noauto \
--mirror-binary ${MIRROR_BINARY} \
--mirror-binary-security ${MIRROR_BINARY_SECURITY} \
--binary-indices true \
- --packages-lists "standard-x11" \
${@}
# hostname and username are configured in config/chroot_local-includes/etc/live/config.conf
diff --git a/auto/kanotix b/auto/kanotix
index c61e9cf..c99757b 100755
--- a/auto/kanotix
+++ b/auto/kanotix
@@ -7,7 +7,6 @@ usage()
cat <<eof
Additional Options for Kanotix:
- [--kanotix-flavours FLAVOUR|"FLAVOURS"]
[--include-nvidia true|false]
[--tmpfs true|false]
[--tmpfs-options OPTIONS]
@@ -17,7 +16,6 @@ eof
write_kanotix_config()
{
-[ -z "${LB_KANOTIX_FLAVOURS}" ] && LB_KANOTIX_FLAVOURS="kanotix-master"
[ -z "${LB_KANOTIX_NVIDIA}" ] && LB_KANOTIX_NVIDIA="true"
[ -z "${LB_KANOTIX_TMPFS}" ] && [ -d tmpfs ] && LB_KANOTIX_TMPFS="true"
[ -z "${LB_KANOTIX_TMPFS}" ] && LB_KANOTIX_TMPFS="false"
@@ -26,10 +24,6 @@ write_kanotix_config()
cat >config/kanotix << EOF
# config/kanotix - additional options for Kanotix
-# \$LB_KANOTIX_FLAVOURS: select Kanotix-packageslists
-# (Default: kanotix-master)
-LB_KANOTIX_FLAVOURS="${LB_KANOTIX_FLAVOURS}"
-
# \$LB_KANOTIX_NVIDIA: include NVidia-Drivers into chroot
# (Default: ${LB_KANOTIX_NVIDIA})
LB_KANOTIX_NVIDIA="${LB_KANOTIX_NVIDIA}"
@@ -51,15 +45,6 @@ unset args; i=1
while [ "$1" ]
do
case "$1" in
- --kanotix-flavour*)
- LB_KANOTIX_FLAVOURS="$2"
- shift
- while [ "$2" -a "${2:0:1}" != "-" ]
- do
- LB_KANOTIX_FLAVOURS="$LB_KANOTIX_FLAVOURS $2"
- shift
- done
- ;;
--include-nvidia)
LB_KANOTIX_NVIDIA="$2"
shift
diff --git a/config/chroot_local-packageslists/acritox b/config/chroot_local-packageslists/acritox
deleted file mode 100644
index 28c0198..0000000
--- a/config/chroot_local-packageslists/acritox
+++ /dev/null
@@ -1,68 +0,0 @@
-# acritox' extra packages list
-
-# development
-dput
-git
-cmake
-kompare
-kdevelop
-qt4-designer
-qt4-dev-tools
-r-base
-r-cran-mass
-r-cran-xml
-r-bioc-biobase
-r-bioc-biostrings
-
-# system
-curlftpfs
-smbfs
-beep
-
-# hardware
-powertop
-
-# latex
-kile
-texlive
-texlive-latex-extra
-texlive-lang-german
-texlive-science
-texlive-pstricks
-texlive-pictures
-pgf
-latexdraw
-latex-beamer
-latex-xcolor
-xournal
-aspell-en
-aspell-de
-
-# pdf tools
-pdftk
-pdfjam
-psutils
-imagemagick
-cups-pdf
-
-# graphics
-inkscape
-exiftran
-jhead
-
-# network
-psi
-kopete
-lftp
-autossh
-
-# multimedia
-vlc
-gtk-recordmydesktop
-
-# desktop eyecandy
-mplayerthumbs
-kdeplasma-addons
-google-gadgets-qt
-plasma-scriptengine-googlegadgets
-
diff --git a/config/chroot_local-packageslists/base b/config/chroot_local-packageslists/base
deleted file mode 100644
index 6d46b8b..0000000
--- a/config/chroot_local-packageslists/base
+++ /dev/null
@@ -1,201 +0,0 @@
-# Kanotix base Packages List
-
-#if ARCHITECTURE i386
-#include <base.i386>
-#endif
-
-#if ARCHITECTURE amd64
-#include <base.amd64>
-#endif
-
-#include <firmware>
-
-# office
-myspell-de-de
-
-# java, plugins
-sun-java6-plugin
-
-# multimedia
-sox
-alsa-oss
-aumix
-dvdauthor
-
-# burn
-normalize-audio
-dvd+rw-tools
-
-# browser, email
-iceweasel-l10n-de
-icedove-l10n-de
-
-# chat, irc
-pidgin
-gstreamer0.10-plugins-base
-gstreamer0.10-plugins-good
-gstreamer0.10-alsa
-weechat
-kanotix-irc
-
-# skype
-skype
-pidgin-skype
-debconf-utils
-
-# graphics
-gimp
-gimp-gutenprint
-xsane
-libsane-extras
-sane-utils
-sane
-
-# editors
-vim
-
-# archive
-unrar
-unzip
-zip
-unp
-
-# tools
-mc
-most
-less
-rsync
-hdparm
-pciutils
-wireless-tools
-sux
-htop
-time
-bash-completion
-grub-pc
-di
-cfv
-whois
-joystick
-screen
-ntpdate
-usb-modeswitch
-tofrodos
-schedtool
-hwinfo
-alsa-oss
-smartmontools
-user-setup
-whois
-infobash
-
-# tools (GUI)
-synaptic
-screentube
-
-# themes
-gtk2-engines
-
-# network
-pcmciautils
-openssh-client
-sshfs
-pppoeconf
-nfs-common
-bluez-audio
-ethtool
-vpnc
-openvpn
-comgt
-wvdial
-
-# print
-cups-bsd
-cups-client
-foomatic-db-engine
-foomatic-db
-foomatic-filters-ppds
-foomatic-db-gutenprint
-cups-driver-gutenprint
-foo2zjs
-printconf
-hplip-gui
-
-# build
-module-assistant
-build-essential
-fakeroot
-libstdc++5
-bzip2
-cdbs
-dkms
-devscripts
-pbuilder
-
-# kanotix
-user-profile-kanotix
-#kanotix-graphics
-grub2-splashimage-kanotix-penguins
-kanotix-scripts
-kanotix-toolkit
-
-# system
-cpufrequtils
-acpi
-acpid
-xdg-utils
-console-setup
-
-# xorg
-xserver-xorg-video-all
-xserver-xorg-input-all
-xserver-xorg-input-wacom
-xserver-xorg-video-radeonhd
-xserver-xorg-video-openchrome
-xserver-xorg-video-geode
-mesa-utils
-libgl1-mesa-dri
-
-# disktools
-dd-rhelp
-testdisk
-gpart
-gparted
-
-# filesystems
-ntfs-3g
-ntfsprogs
-reiserfsprogs
-dmraid
-kpartx
-dosfstools
-lvm2
-
-# filesystem tools
-parted
-os-prober
-mbr
-mdadm
-cryptsetup
-hfsplus
-hfsutils
-jfsutils
-xfsprogs
-
-# firmware
-ndiswrapper-utils-1.9
-libv4l-0
-
-# other hardware
-bluez
-bluez-compat
-bluedevil
-kppp
-ndiswrapper-utils-1.9
-pm-utils
-vbetool
-radeontool
-modemmanager
-umtsmon
-wacom-tools
-
diff --git a/config/chroot_local-packageslists/base.amd64 b/config/chroot_local-packageslists/base.amd64
deleted file mode 100644
index 30b5c74..0000000
--- a/config/chroot_local-packageslists/base.amd64
+++ /dev/null
@@ -1,3 +0,0 @@
-# packages for 64bit systems
-lib32v4l-0
-
diff --git a/config/chroot_local-packageslists/base.i386 b/config/chroot_local-packageslists/base.i386
deleted file mode 100644
index 9909de1..0000000
--- a/config/chroot_local-packageslists/base.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-# packages for 32bit systems
-
diff --git a/config/chroot_local-packageslists/firmware b/config/chroot_local-packageslists/firmware
deleted file mode 100644
index b14a864..0000000
--- a/config/chroot_local-packageslists/firmware
+++ /dev/null
@@ -1,13 +0,0 @@
-firmware-atheros
-firmware-bnx2
-firmware-bnx2x
-firmware-intelwimax
-firmware-ipw2x00
-firmware-ivtv
-firmware-iwlwifi
-firmware-linux
-firmware-linux-free
-firmware-linux-nonfree
-firmware-qlogic
-firmware-ralink
-firmware-realtek
diff --git a/config/chroot_local-packageslists/kanotix-full b/config/chroot_local-packageslists/kanotix-full
deleted file mode 100644
index 86e1e60..0000000
--- a/config/chroot_local-packageslists/kanotix-full
+++ /dev/null
@@ -1,12 +0,0 @@
-# Kanotix Full
-
-#include <kanotix-master>
-#include <acritox>
-
-# multimedia
-amarok
-smplayer
-
-# kde
-khelpcenter4
-
diff --git a/config/chroot_local-packageslists/kanotix-lite b/config/chroot_local-packageslists/kanotix-lite
deleted file mode 100644
index 22f7bef..0000000
--- a/config/chroot_local-packageslists/kanotix-lite
+++ /dev/null
@@ -1,5 +0,0 @@
-# Kanotix Lite
-
-#include <base>
-#include <kde>
-
diff --git a/config/chroot_local-packageslists/kanotix-master b/config/chroot_local-packageslists/kanotix-master
deleted file mode 100644
index 209c1ec..0000000
--- a/config/chroot_local-packageslists/kanotix-master
+++ /dev/null
@@ -1,20 +0,0 @@
-# Kanotix
-
-#include <base>
-#include <kde>
-#include <office>
-
-# multimedia
-gecko-mediaplayer
-tunapie
-audacious
-streamripper
-
-# wine
-wine
-wine-gecko
-
-# plymouth
-plymouth
-plymouth-themes-solar
-
diff --git a/config/chroot_local-packageslists/kde b/config/chroot_local-packageslists/kde
deleted file mode 100644
index e170fe0..0000000
--- a/config/chroot_local-packageslists/kde
+++ /dev/null
@@ -1,61 +0,0 @@
-# Kanotix additional packages list for kde
-
-# office
-okular
-
-# plugins
-konqueror-nsplugins
-
-# multimedia
-kaffeine
-libsdl1.2debian-alsa
-kdemultimedia-kio-plugins
-kamera
-
-# burn
-k3b
-k3b-i18n
-libk3b6-extracodecs
-
-# chat, irc
-konversation
-
-# graphics
-gwenview
-
-# editors
-kate
-
-# archive
-ark
-
-# tools
-ksnapshot
-kcalc
-kuser
-gdebi-kde
-
-# 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
-kde-config-tablet
-system-config-printer-kde
-
diff --git a/config/chroot_local-packageslists/office b/config/chroot_local-packageslists/office
deleted file mode 100644
index e998500..0000000
--- a/config/chroot_local-packageslists/office
+++ /dev/null
@@ -1,12 +0,0 @@
-# openoffice
-openoffice.org-calc
-openoffice.org-common
-openoffice.org-core
-openoffice.org-draw
-openoffice.org-impress
-openoffice.org-java-common
-openoffice.org-kde
-openoffice.org-math
-openoffice.org-writer
-openoffice.org-l10n-de
-openoffice.org-thesaurus-de
diff --git a/config/lists/acritox b/config/lists/acritox
new file mode 100644
index 0000000..28c0198
--- /dev/null
+++ b/config/lists/acritox
@@ -0,0 +1,68 @@
+# acritox' extra packages list
+
+# development
+dput
+git
+cmake
+kompare
+kdevelop
+qt4-designer
+qt4-dev-tools
+r-base
+r-cran-mass
+r-cran-xml
+r-bioc-biobase
+r-bioc-biostrings
+
+# system
+curlftpfs
+smbfs
+beep
+
+# hardware
+powertop
+
+# latex
+kile
+texlive
+texlive-latex-extra
+texlive-lang-german
+texlive-science
+texlive-pstricks
+texlive-pictures
+pgf
+latexdraw
+latex-beamer
+latex-xcolor
+xournal
+aspell-en
+aspell-de
+
+# pdf tools
+pdftk
+pdfjam
+psutils
+imagemagick
+cups-pdf
+
+# graphics
+inkscape
+exiftran
+jhead
+
+# network
+psi
+kopete
+lftp
+autossh
+
+# multimedia
+vlc
+gtk-recordmydesktop
+
+# desktop eyecandy
+mplayerthumbs
+kdeplasma-addons
+google-gadgets-qt
+plasma-scriptengine-googlegadgets
+
diff --git a/config/lists/base b/config/lists/base
new file mode 100644
index 0000000..4c246cc
--- /dev/null
+++ b/config/lists/base
@@ -0,0 +1,202 @@
+# Kanotix base Packages List
+
+#if ARCHITECTURE i386
+#include <base.i386>
+#endif
+
+#if ARCHITECTURE amd64
+#include <base.amd64>
+#endif
+
+#include <firmware>
+#include <standard-x11>
+
+# office
+myspell-de-de
+
+# java, plugins
+sun-java6-plugin
+
+# multimedia
+sox
+alsa-oss
+aumix
+dvdauthor
+
+# burn
+normalize-audio
+dvd+rw-tools
+
+# browser, email
+iceweasel-l10n-de
+icedove-l10n-de
+
+# chat, irc
+pidgin
+gstreamer0.10-plugins-base
+gstreamer0.10-plugins-good
+gstreamer0.10-alsa
+weechat
+kanotix-irc
+
+# skype
+skype
+pidgin-skype
+debconf-utils
+
+# graphics
+gimp
+gimp-gutenprint
+xsane
+libsane-extras
+sane-utils
+sane
+
+# editors
+vim
+
+# archive
+unrar
+unzip
+zip
+unp
+
+# tools
+mc
+most
+less
+rsync
+hdparm
+pciutils
+wireless-tools
+sux
+htop
+time
+bash-completion
+grub-pc
+di
+cfv
+whois
+joystick
+screen
+ntpdate
+usb-modeswitch
+tofrodos
+schedtool
+hwinfo
+alsa-oss
+smartmontools
+user-setup
+whois
+infobash
+
+# tools (GUI)
+synaptic
+screentube
+
+# themes
+gtk2-engines
+
+# network
+pcmciautils
+openssh-client
+sshfs
+pppoeconf
+nfs-common
+bluez-audio
+ethtool
+vpnc
+openvpn
+comgt
+wvdial
+
+# print
+cups-bsd
+cups-client
+foomatic-db-engine
+foomatic-db
+foomatic-filters-ppds
+foomatic-db-gutenprint
+cups-driver-gutenprint
+foo2zjs
+printconf
+hplip-gui
+
+# build
+module-assistant
+build-essential
+fakeroot
+libstdc++5
+bzip2
+cdbs
+dkms
+devscripts
+pbuilder
+
+# kanotix
+user-profile-kanotix
+#kanotix-graphics
+grub2-splashimage-kanotix-penguins
+kanotix-scripts
+kanotix-toolkit
+
+# system
+cpufrequtils
+acpi
+acpid
+xdg-utils
+console-setup
+
+# xorg
+xserver-xorg-video-all
+xserver-xorg-input-all
+xserver-xorg-input-wacom
+xserver-xorg-video-radeonhd
+xserver-xorg-video-openchrome
+xserver-xorg-video-geode
+mesa-utils
+libgl1-mesa-dri
+
+# disktools
+dd-rhelp
+testdisk
+gpart
+gparted
+
+# filesystems
+ntfs-3g
+ntfsprogs
+reiserfsprogs
+dmraid
+kpartx
+dosfstools
+lvm2
+
+# filesystem tools
+parted
+os-prober
+mbr
+mdadm
+cryptsetup
+hfsplus
+hfsutils
+jfsutils
+xfsprogs
+
+# firmware
+ndiswrapper-utils-1.9
+libv4l-0
+
+# other hardware
+bluez
+bluez-compat
+bluedevil
+kppp
+ndiswrapper-utils-1.9
+pm-utils
+vbetool
+radeontool
+modemmanager
+umtsmon
+wacom-tools
+
diff --git a/config/lists/base.amd64 b/config/lists/base.amd64
new file mode 100644
index 0000000..30b5c74
--- /dev/null
+++ b/config/lists/base.amd64
@@ -0,0 +1,3 @@
+# packages for 64bit systems
+lib32v4l-0
+
diff --git a/config/lists/base.i386 b/config/lists/base.i386
new file mode 100644
index 0000000..9909de1
--- /dev/null
+++ b/config/lists/base.i386
@@ -0,0 +1,2 @@
+# packages for 32bit systems
+
diff --git a/config/lists/firmware b/config/lists/firmware
new file mode 100644
index 0000000..b14a864
--- /dev/null
+++ b/config/lists/firmware
@@ -0,0 +1,13 @@
+firmware-atheros
+firmware-bnx2
+firmware-bnx2x
+firmware-intelwimax
+firmware-ipw2x00
+firmware-ivtv
+firmware-iwlwifi
+firmware-linux
+firmware-linux-free
+firmware-linux-nonfree
+firmware-qlogic
+firmware-ralink
+firmware-realtek
diff --git a/config/lists/kanotix-full b/config/lists/kanotix-full
new file mode 100644
index 0000000..86e1e60
--- /dev/null
+++ b/config/lists/kanotix-full
@@ -0,0 +1,12 @@
+# Kanotix Full
+
+#include <kanotix-master>
+#include <acritox>
+
+# multimedia
+amarok
+smplayer
+
+# kde
+khelpcenter4
+
diff --git a/config/lists/kanotix-lite b/config/lists/kanotix-lite
new file mode 100644
index 0000000..22f7bef
--- /dev/null
+++ b/config/lists/kanotix-lite
@@ -0,0 +1,5 @@
+# Kanotix Lite
+
+#include <base>
+#include <kde>
+
diff --git a/config/lists/kanotix-master b/config/lists/kanotix-master
new file mode 100644
index 0000000..209c1ec
--- /dev/null
+++ b/config/lists/kanotix-master
@@ -0,0 +1,20 @@
+# Kanotix
+
+#include <base>
+#include <kde>
+#include <office>
+
+# multimedia
+gecko-mediaplayer
+tunapie
+audacious
+streamripper
+
+# wine
+wine
+wine-gecko
+
+# plymouth
+plymouth
+plymouth-themes-solar
+
diff --git a/config/lists/kde b/config/lists/kde
new file mode 100644
index 0000000..e170fe0
--- /dev/null
+++ b/config/lists/kde
@@ -0,0 +1,61 @@
+# Kanotix additional packages list for kde
+
+# office
+okular
+
+# plugins
+konqueror-nsplugins
+
+# multimedia
+kaffeine
+libsdl1.2debian-alsa
+kdemultimedia-kio-plugins
+kamera
+
+# burn
+k3b
+k3b-i18n
+libk3b6-extracodecs
+
+# chat, irc
+konversation
+
+# graphics
+gwenview
+
+# editors
+kate
+
+# archive
+ark
+
+# tools
+ksnapshot
+kcalc
+kuser
+gdebi-kde
+
+# 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
+kde-config-tablet
+system-config-printer-kde
+
diff --git a/config/lists/office b/config/lists/office
new file mode 100644
index 0000000..e998500
--- /dev/null
+++ b/config/lists/office
@@ -0,0 +1,12 @@
+# openoffice
+openoffice.org-calc
+openoffice.org-common
+openoffice.org-core
+openoffice.org-draw
+openoffice.org-impress
+openoffice.org-java-common
+openoffice.org-kde
+openoffice.org-math
+openoffice.org-writer
+openoffice.org-l10n-de
+openoffice.org-thesaurus-de
--
cgit v1.0