From e5a0948707b00f7ff64bda0f29d9a489bacb9f2b Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sun, 11 Jul 2004 20:45:42 +0000 Subject: [PATCH] Stefan Fiedler: target/server/config.in, target/desktop/config.in, target/epiam/config.in, target/bootdisk/config.in, misc/pkgsel/minimal.in: disable packages instead of removing them from the package list. [2004070616555028421] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3564 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/pkgsel/minimal.in | 44 ++++++++++++++--------------- target/bootdisk/config.in | 12 ++++---- target/desktop/config.in | 18 ++++++------ target/epiam/config.in | 24 ++++++++-------- target/server/config.in | 58 +++++++++++++++++++-------------------- 5 files changed, 78 insertions(+), 78 deletions(-) diff --git a/misc/pkgsel/minimal.in b/misc/pkgsel/minimal.in index 3dabd19e4..bd4981c11 100644 --- a/misc/pkgsel/minimal.in +++ b/misc/pkgsel/minimal.in @@ -25,28 +25,28 @@ pkgfilter sed ' # Disable packages -/ a2ps / { s/^X /O /p; d; }; -/ alsa / { s/^X /O /p; d; }; -/ alsa-driver / { s/^X /O /p; d; }; -/ bdb40 / { s/^X /O /p; d; }; -/ biff+comsat / { s/^X /O /p; d; }; -/ bsd-finger / { s/^X /O /p; d; }; -/ bind / { s/^X /O /p; d; }; -/ gpm / { s/^X /O /p; d; }; -/ howtos / { s/^X /O /p; d; }; -/ ifhp / { s/^X /O /p; d; }; -/ ircii / { s/^X /O /p; d; }; -/ irda-utils / { s/^X /O /p; d; }; -/ joe / { s/^X /O /p; d; }; -/ lprng / { s/^X /O /p; d; }; -/ mutt / { s/^X /O /p; d; }; -/ net-snmp / { s/^X /O /p; d; }; -/ pine / { s/^X /O /p; d; }; -/ procmail / { s/^X /O /p; d; }; -/ rfc / { s/^X /O /p; d; }; -/ rpm / { s/^X /O /p; d; }; -/ sendmail / { s/^X /O /p; d; }; -/ wu-ftpd / { s/^X /O /p; d; }; +/ a2ps / { s/^X /O /; p; d; }; +/ alsa / { s/^X /O /; p; d; }; +/ alsa-driver / { s/^X /O /; p; d; }; +/ bdb40 / { s/^X /O /; p; d; }; +/ biff+comsat / { s/^X /O /; p; d; }; +/ bsd-finger / { s/^X /O /; p; d; }; +/ bind / { s/^X /O /; p; d; }; +/ gpm / { s/^X /O /; p; d; }; +/ howtos / { s/^X /O /; p; d; }; +/ ifhp / { s/^X /O /; p; d; }; +/ ircii / { s/^X /O /; p; d; }; +/ irda-utils / { s/^X /O /; p; d; }; +/ joe / { s/^X /O /; p; d; }; +/ lprng / { s/^X /O /; p; d; }; +/ mutt / { s/^X /O /; p; d; }; +/ net-snmp / { s/^X /O /; p; d; }; +/ pine / { s/^X /O /; p; d; }; +/ procmail / { s/^X /O /; p; d; }; +/ rfc / { s/^X /O /; p; d; }; +/ rpm / { s/^X /O /; p; d; }; +/ sendmail / { s/^X /O /; p; d; }; +/ wu-ftpd / { s/^X /O /; p; d; }; # Select repositories / base / { p; d; }; diff --git a/target/bootdisk/config.in b/target/bootdisk/config.in index c50072050..c23d2ff63 100644 --- a/target/bootdisk/config.in +++ b/target/bootdisk/config.in @@ -52,14 +52,14 @@ pkgfilter sed ' / linux24benh/ { p; d; }; / syslinux / { p; d; }; # Disable packages which are not in base or not build in stages 0-4 -/ base / ! { s/^X /O /p; d; }; /^. -----/ { s/^X /O /p; d; }; +/ base / ! { s/^X /O /; p; d; }; /^. -----/ { s/^X /O /; p; d; }; # Disable even more packages we do not need -/ gcc2 / { s/^X /O /p; d; }; / joe / { s/^X /O /p; d; }; -/ gdbm / { s/^X /O /p; d; }; / pam / { s/^X /O /p; d; }; -/ pdksh / { s/^X /O /p; d; }; / libelf / { s/^X /O /p; d; }; -/ prelink / { s/^X /O /p; d; }; / ccache / { s/^X /O /p; d; }; -/ cracklib / { s/^X /O /p; d; }; / hotplug / { s/^X /O /p; d; };' +/ gcc2 / { s/^X /O /; p; d; }; / joe / { s/^X /O /; p; d; }; +/ gdbm / { s/^X /O /; p; d; }; / pam / { s/^X /O /; p; d; }; +/ pdksh / { s/^X /O /; p; d; }; / libelf / { s/^X /O /; p; d; }; +/ prelink / { s/^X /O /; p; d; }; / ccache / { s/^X /O /; p; d; }; +/ cracklib / { s/^X /O /; p; d; }; / hotplug / { s/^X /O /; p; d; };' ROCKCFGSET_CREATE_TARBZ2=1 ROCKCFGSET_CREATE_GEM=0 diff --git a/target/desktop/config.in b/target/desktop/config.in index 1a17610d4..b4c751e55 100644 --- a/target/desktop/config.in +++ b/target/desktop/config.in @@ -23,12 +23,12 @@ pkgfilter sed ' # Disable packages -/ sendmail / { s/^X /O /p; d; }; -/ workbone / { s/^X /O /p; d; }; -/ ifhp / { s/^X /O /p; d; }; -/ xv / { s/^X /O /p; d; }; -/ wu-ftp / { s/^X /O /p; d; }; -/ gcc2 / { s/^X /O /p; d; }; +/ sendmail / { s/^X /O /; p; d; }; +/ workbone / { s/^X /O /; p; d; }; +/ ifhp / { s/^X /O /; p; d; }; +/ xv / { s/^X /O /; p; d; }; +/ wu-ftp / { s/^X /O /; p; d; }; +/ gcc2 / { s/^X /O /; p; d; }; # Select some packages (and repositories) explicitely / base / { p; d; }; @@ -107,9 +107,9 @@ pkgfilter sed ' / nedit / { p; d; }; # misc repository -/ centericq / { s/^X /O /p; d; } -/ openbox / { s/^X /O /p; d; } -/ zsh / { s/^X /O /p; d; } +/ centericq / { s/^X /O /; p; d; } +/ openbox / { s/^X /O /; p; d; } +/ zsh / { s/^X /O /; p; d; } / misc / { p; d; }; # michiel repository diff --git a/target/epiam/config.in b/target/epiam/config.in index e2a0afbd0..8dbb4ebd5 100644 --- a/target/epiam/config.in +++ b/target/epiam/config.in @@ -23,15 +23,15 @@ pkgfilter sed ' # Disable packages -/ sendmail / { s/^X /O /p; d; }; -/ workbone / { s/^X /O /p; d; }; -/ ifhp / { s/^X /O /p; d; }; -# / xv / { s/^X /O /p; d; }; -/ wu-ftp / { s/^X /O /p; d; }; -/ gcc2 / { s/^X /O /p; d; }; -/ linux26* / { s/^X /O /p; d; }; -/ module-init-tools / { s/^X /O /p; d; }; -/ bootsplash / { s/^X /O /p; d; }; +/ sendmail / { s/^X /O /; p; d; }; +/ workbone / { s/^X /O /; p; d; }; +/ ifhp / { s/^X /O /; p; d; }; +# / xv / { s/^X /O /; p; d; }; +/ wu-ftp / { s/^X /O /; p; d; }; +/ gcc2 / { s/^X /O /; p; d; }; +/ linux26* / { s/^X /O /; p; d; }; +/ module-init-tools / { s/^X /O /; p; d; }; +/ bootsplash / { s/^X /O /; p; d; }; # Select some packages (and repositories) explicitely / base / { p; d; }; @@ -110,9 +110,9 @@ pkgfilter sed ' / nedit / { p; d; }; # misc repository -/ centericq / { s/^X /O /p; d; } -/ openbox / { s/^X /O /p; d; } -/ zsh / { s/^X /O /p; d; } +/ centericq / { s/^X /O /; p; d; } +/ openbox / { s/^X /O /; p; d; } +/ zsh / { s/^X /O /; p; d; } / misc / { p; d; }; # michiel repository diff --git a/target/server/config.in b/target/server/config.in index 0c7d386ae..5e80f1d19 100644 --- a/target/server/config.in +++ b/target/server/config.in @@ -23,35 +23,35 @@ pkgfilter sed ' # disable packages not needed, or errors -/ workbone / { s/^X /O /p; d; }; -/ ifhp / { s/^X /O /p; d; }; -/ xv / { s/^X /O /p; d; }; -/ wu-ftp / { s/^X /O /p; d; }; -/ coda / { s/^X /O /p; d; }; -/\/x11 / { s/^X /O /p; d; }; -/\/gnome / { s/^X /O /p; d; }; -/\/kde / { s/^X /O /p; d; }; -/ mldonkey / { s/^X /O /p; d; }; -/ gaim / { s/^X /O /p; d; }; -/ xcdroast / { s/^X /O /p; d; }; -/ gnapster / { s/^X /O /p; d; }; -/ gtoaster / { s/^X /O /p; d; }; -/ xchat / { s/^X /O /p; d; }; -/ irssi / { s/^X /O /p; d; }; -/ qtparted / { s/^X /O /p; d; }; -/ rdesktop / { s/^X /O /p; d; }; -/ tsclient / { s/^X /O /p; d; }; -/ libsdl_net / { s/^X /O /p; d; }; -/ xfsamba / { s/^X /O /p; d; }; -/ vnc / { s/^X /O /p; d; }; -/ unison / { s/^X /O /p; d; }; -/ razor / { s/^X /O /p; d; }; -/ k3b / { s/^X /O /p; d; }; -/ ettercap / { s/^X /O /p; d; }; -/ ethereal / { s/^X /O /p; d; }; -/ efsd / { s/^X /O /p; d; }; -/ licq / { s/^X /O /p; d; }; # based on qt -/ mgt / { s/^X /O /p; d; }; # based on gnome +/ workbone / { s/^X /O /; p; d; }; +/ ifhp / { s/^X /O /; p; d; }; +/ xv / { s/^X /O /; p; d; }; +/ wu-ftp / { s/^X /O /; p; d; }; +/ coda / { s/^X /O /; p; d; }; +/\/x11 / { s/^X /O /; p; d; }; +/\/gnome / { s/^X /O /; p; d; }; +/\/kde / { s/^X /O /; p; d; }; +/ mldonkey / { s/^X /O /; p; d; }; +/ gaim / { s/^X /O /; p; d; }; +/ xcdroast / { s/^X /O /; p; d; }; +/ gnapster / { s/^X /O /; p; d; }; +/ gtoaster / { s/^X /O /; p; d; }; +/ xchat / { s/^X /O /; p; d; }; +/ irssi / { s/^X /O /; p; d; }; +/ qtparted / { s/^X /O /; p; d; }; +/ rdesktop / { s/^X /O /; p; d; }; +/ tsclient / { s/^X /O /; p; d; }; +/ libsdl_net / { s/^X /O /; p; d; }; +/ xfsamba / { s/^X /O /; p; d; }; +/ vnc / { s/^X /O /; p; d; }; +/ unison / { s/^X /O /; p; d; }; +/ razor / { s/^X /O /; p; d; }; +/ k3b / { s/^X /O /; p; d; }; +/ ettercap / { s/^X /O /; p; d; }; +/ ethereal / { s/^X /O /; p; d; }; +/ efsd / { s/^X /O /; p; d; }; +/ licq / { s/^X /O /; p; d; }; # based on qt +/ mgt / { s/^X /O /; p; d; }; # based on gnome # Select some packages (and repositories) explicitely