From 438c4c16efc3d5711f69f46462211e34d555515b Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Wed, 8 Sep 2010 20:58:47 +0200 Subject: changed packageslists, added "--kanotix-flavours" --- auto/build | 10 + auto/clean | 3 +- auto/kanotix | 15 ++ config/chroot_local-packageslists/acritox | 54 +++++ .../acritox.list.disabled | 60 ------ 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/firmware.list | 13 -- config/chroot_local-packageslists/kanotix-full | 5 + config/chroot_local-packageslists/kanotix-lite | 5 + config/chroot_local-packageslists/kanotix-master | 10 + config/chroot_local-packageslists/kanotix.amd64 | 3 - config/chroot_local-packageslists/kanotix.i386 | 2 - config/chroot_local-packageslists/kanotix.list | 231 --------------------- config/chroot_local-packageslists/kde | 59 ++++++ config/chroot_local-packageslists/office | 12 ++ .../openoffice.list.disabled | 12 -- 19 files changed, 391 insertions(+), 322 deletions(-) create mode 100644 config/chroot_local-packageslists/acritox delete mode 100644 config/chroot_local-packageslists/acritox.list.disabled create mode 100644 config/chroot_local-packageslists/base create mode 100644 config/chroot_local-packageslists/base.amd64 create mode 100644 config/chroot_local-packageslists/base.i386 create mode 100644 config/chroot_local-packageslists/firmware delete mode 100644 config/chroot_local-packageslists/firmware.list create mode 100644 config/chroot_local-packageslists/kanotix-full create mode 100644 config/chroot_local-packageslists/kanotix-lite create mode 100644 config/chroot_local-packageslists/kanotix-master delete mode 100644 config/chroot_local-packageslists/kanotix.amd64 delete mode 100644 config/chroot_local-packageslists/kanotix.i386 delete mode 100644 config/chroot_local-packageslists/kanotix.list create mode 100644 config/chroot_local-packageslists/kde create mode 100644 config/chroot_local-packageslists/office delete mode 100644 config/chroot_local-packageslists/openoffice.list.disabled 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 <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 b/config/chroot_local-packageslists/acritox new file mode 100644 index 0000000..a95b8f4 --- /dev/null +++ b/config/chroot_local-packageslists/acritox @@ -0,0 +1,54 @@ +# acritox' extra packages list + +# development +dput +git +cmake +kompare +kdevelop +qt4-designer +qt4-dev-tools + +# system +curlftpfs +smbfs +beep + +# hardware +powertop + +# latex +kile +texlive +latex-xcolor +xournal + +# pdf tools +pdftk +pdfjam +psutils +imagemagick +cups-pdf + +# graphics +inkscape +exiftran +jhead + +# network +psi +kopete +lftp +autossh + +# multimedia +gecko-mediaplayer +vlc +gtk-recordmydesktop + +# desktop eyecandy +mplayerthumbs +kdeplasma-addons +google-gadgets-qt +plasma-scriptengine-googlegadgets + diff --git a/config/chroot_local-packageslists/acritox.list.disabled b/config/chroot_local-packageslists/acritox.list.disabled deleted file mode 100644 index 6b6003b..0000000 --- a/config/chroot_local-packageslists/acritox.list.disabled +++ /dev/null @@ -1,60 +0,0 @@ -# acritox' extra packages list -# rename to acritox.list to enable - -# development -dput -git -cmake -kompare -kdevelop -qt4-designer -qt4-dev-tools - -# system -curlftpfs -smbfs -beep - -# hardware -bluetooth -powertop - -# latex -kile -texlive -latex-xcolor -xournal - -# pdf tools -pdftk -pdfjam -psutils -imagemagick -cups-pdf - -# graphics -inkscape -exiftran -jhead - -# network -psi -kopete -lftp -autossh - -# multimedia -gecko-mediaplayer -vlc -gtk-recordmydesktop - -# desktop eyecandy -mplayerthumbs -kdeplasma-addons -google-gadgets-qt -plasma-scriptengine-googlegadgets - -# 3rd party -#nxclient -#picasa - diff --git a/config/chroot_local-packageslists/base b/config/chroot_local-packageslists/base new file mode 100644 index 0000000..51794b4 --- /dev/null +++ b/config/chroot_local-packageslists/base @@ -0,0 +1,201 @@ +# Kanotix base Packages List + +#if ARCHITECTURE i386 +#include +#endif + +#if ARCHITECTURE amd64 +#include +#endif + +#include + +# office +myspell-de-de + +# java, plugins +sun-java6-plugin + +# multimedia +sox +alsa-oss +aumix +smplayer +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 +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 +sysv-freeze +xdg-utils +console-setup + +# xorg +xserver-xorg-video-all +xserver-xorg-input-all +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 new file mode 100644 index 0000000..30b5c74 --- /dev/null +++ b/config/chroot_local-packageslists/base.amd64 @@ -0,0 +1,3 @@ +# packages for 64bit systems +lib32v4l-0 + diff --git a/config/chroot_local-packageslists/base.i386 b/config/chroot_local-packageslists/base.i386 new file mode 100644 index 0000000..9909de1 --- /dev/null +++ b/config/chroot_local-packageslists/base.i386 @@ -0,0 +1,2 @@ +# packages for 32bit systems + diff --git a/config/chroot_local-packageslists/firmware b/config/chroot_local-packageslists/firmware new file mode 100644 index 0000000..b14a864 --- /dev/null +++ b/config/chroot_local-packageslists/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/chroot_local-packageslists/firmware.list b/config/chroot_local-packageslists/firmware.list deleted file mode 100644 index b14a864..0000000 --- a/config/chroot_local-packageslists/firmware.list +++ /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 new file mode 100644 index 0000000..4c34fbc --- /dev/null +++ b/config/chroot_local-packageslists/kanotix-full @@ -0,0 +1,5 @@ +# Kanotix Full + +#include +#include + 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 +#include + 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 +#include +#include + +# wine +wine +wine-gecko + diff --git a/config/chroot_local-packageslists/kanotix.amd64 b/config/chroot_local-packageslists/kanotix.amd64 deleted file mode 100644 index 30b5c74..0000000 --- a/config/chroot_local-packageslists/kanotix.amd64 +++ /dev/null @@ -1,3 +0,0 @@ -# packages for 64bit systems -lib32v4l-0 - diff --git a/config/chroot_local-packageslists/kanotix.i386 b/config/chroot_local-packageslists/kanotix.i386 deleted file mode 100644 index 9909de1..0000000 --- a/config/chroot_local-packageslists/kanotix.i386 +++ /dev/null @@ -1,2 +0,0 @@ -# packages for 32bit systems - diff --git a/config/chroot_local-packageslists/kanotix.list b/config/chroot_local-packageslists/kanotix.list deleted file mode 100644 index 2dfd381..0000000 --- a/config/chroot_local-packageslists/kanotix.list +++ /dev/null @@ -1,231 +0,0 @@ -# Kanotix Packages List - -#if ARCHITECTURE i386 -#include -#endif - -#if ARCHITECTURE amd64 -#include -#endif - -# Kanotix base packages list - -# office -okular -myspell-de-de - -# wine, java, plugins -konqueror-nsplugins -sun-java6-plugin -wine -wine-gecko - -# multimedia -kaffeine -libsdl1.2debian-alsa -amarok -kdemultimedia-kio-plugins -kamera -sox -alsa-oss -aumix -smplayer -dvdauthor - -# burn -k3b -k3b-i18n -libk3b6-extracodecs -normalize-audio -dvd+rw-tools - -# browser, email -iceweasel-l10n-de -icedove-l10n-de - -# chat, irc -pidgin -gstreamer0.10-plugins-base -gstreamer0.10-plugins-good -weechat -konversation -kanotix-irc - -# skype -skype -pidgin-skype -debconf-utils - -# graphics -gimp -gimp-gutenprint -xsane -libsane-extras -sane-utils -sane -gwenview - -# editors -vim -kate - -# archive -unrar -unzip -zip -unp -ark - -# 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) -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 -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 -kanotix-menu -etcskel-kanotix -user-profile-kanotix -#kanotix-graphics -grub2-splashimage-kanotix-penguins -kanotix-scripts -kanotix-toolkit -acritoxinstaller-kanotix - -# system -acpid -sysv-freeze -xdg-utils -console-setup - -# xorg -xserver-xorg-video-all -xserver-xorg-input-all -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 -kde-config-touchpad - 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/office b/config/chroot_local-packageslists/office new file mode 100644 index 0000000..e998500 --- /dev/null +++ b/config/chroot_local-packageslists/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 diff --git a/config/chroot_local-packageslists/openoffice.list.disabled b/config/chroot_local-packageslists/openoffice.list.disabled deleted file mode 100644 index e998500..0000000 --- a/config/chroot_local-packageslists/openoffice.list.disabled +++ /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 -- cgit v1.0