From 36d3975206bf0ee6a4fcc1902a6860151e3baff3 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 12 Sep 2004 13:42:21 +0000 Subject: [PATCH] Clifford Wolf: Fixed some package selections for splitted bash [2004090814152027472] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4211 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/pkgsel/benchmark.in | 2 +- misc/pkgsel/minimal+xfree.in | 2 +- misc/pkgsel/minimal-desktop.in | 2 +- target/bootdisk/build_stage2.sh | 2 +- target/lvp/config.in | 2 +- target/router/pkgsel.sed | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/misc/pkgsel/benchmark.in b/misc/pkgsel/benchmark.in index ccb79ddf5..ce7ec9beb 100644 --- a/misc/pkgsel/benchmark.in +++ b/misc/pkgsel/benchmark.in @@ -33,7 +33,7 @@ pkgfilter sed ' / dialog / { p; d; }; / autoconf / { p; d; }; / automake=automake18 / { p; d; }; -/ bash / { p; d; }; +/ bash=bash2 / { p; d; }; / binutils / { p; d; }; / bison / { p; d; }; / bzip2 / { p; d; }; diff --git a/misc/pkgsel/minimal+xfree.in b/misc/pkgsel/minimal+xfree.in index 01e0af78e..8880a8812 100644 --- a/misc/pkgsel/minimal+xfree.in +++ b/misc/pkgsel/minimal+xfree.in @@ -34,7 +34,7 @@ pkgfilter sed ' / dialog / { p; d; }; / autoconf / { p; d; }; / automake=automake18 / { p; d; }; -/ bash / { p; d; }; +/ bash=bash2 / { p; d; }; / binutils / { p; d; }; / bison / { p; d; }; / bzip2 / { p; d; }; diff --git a/misc/pkgsel/minimal-desktop.in b/misc/pkgsel/minimal-desktop.in index 5c6e348f6..c6280d022 100644 --- a/misc/pkgsel/minimal-desktop.in +++ b/misc/pkgsel/minimal-desktop.in @@ -33,7 +33,7 @@ pkgfilter sed ' / dialog / { p; d; }; / autoconf / { p; d; }; / automake=automake18 / { p; d; }; -/ bash / { p; d; }; +/ bash=bash2 / { p; d; }; / binutils / { p; d; }; / bison / { p; d; }; / bzip2 / { p; d; }; diff --git a/target/bootdisk/build_stage2.sh b/target/bootdisk/build_stage2.sh index ac2c0b4ab..0a547c774 100644 --- a/target/bootdisk/build_stage2.sh +++ b/target/bootdisk/build_stage2.sh @@ -23,7 +23,7 @@ package_map=' +00-dirtree +glibc22 +glibc23 -mine -bize -termcap +ncurses +readline -strace -ltrace -perl5 -m4 -time -gettext -zlib -+bash +attr +acl +findutils ++bash2 +attr +acl +findutils +mktemp +coreutils -diffutils -patch -make +grep +sed +gzip +tar +gawk -flex +bzip2 diff --git a/target/lvp/config.in b/target/lvp/config.in index b29155a03..1b3e500d3 100644 --- a/target/lvp/config.in +++ b/target/lvp/config.in @@ -27,7 +27,7 @@ pkgfilter sed ' / 00-dirtree / { p; d; }; / autoconf / { p; d; }; / automake / { p; d; }; -/ bash / { p; d; }; +/ bash=bash2 / { p; d; }; / bin86 / { p; d; }; / binutils / { p; d; }; / bison / { p; d; }; diff --git a/target/router/pkgsel.sed b/target/router/pkgsel.sed index 77df212da..c9b9e8406 100644 --- a/target/router/pkgsel.sed +++ b/target/router/pkgsel.sed @@ -3,10 +3,10 @@ / acl / { p; d; } / attr / { p; d; } / autoconf / { p; d; } -/ automake / { p; d; } -/ bash / { p; d; } -/ bdb33 / { p; d; } -/ bdb41 / { p; d; } +/ automake=automake18 / { p; d; } +/ bash=bash2 / { p; d; } +/ bdb=bdb33 / { p; d; } +/ bdb=bdb41 / { p; d; } / binutils / { p; d; } / bison / { p; d; } / bzip2 / { p; d; }