From 1dd22a4a16dc33b7517e4410050037f434a9ac95 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 10 Jun 2006 09:22:19 +0000 Subject: [PATCH] Stefan Fiedler: target/livecd/config.in: fix default package selection (gcc macros vs. shell functions) [2006053020153825200] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7646 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/livecd/config.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/livecd/config.in b/target/livecd/config.in index 82a7f8c31..553f06751 100644 --- a/target/livecd/config.in +++ b/target/livecd/config.in @@ -60,8 +60,13 @@ ROCKCFGSET_PKG_LINUX_USE26MODTOOLS=1 # not static subversion ROCKCFGSET_PKG_SUBVERSION_STATIC=0 -# hardwired for now... -cpp -undef -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/minimal-desktop.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed +# default package selection for this target... +# begin the sed string +echo "pkgfilter sed '" > config/$config.$swpid/predefined-pkgsel.parsed +. ./misc/pkgsel/macros +. ./misc/pkgsel/minimal-desktop.in >> config/$config.$swpid/predefined-pkgsel.parsed +# end the sed string +echo "'" >> config/$config.$swpid/predefined-pkgsel.parsed . config/$config.$swpid/predefined-pkgsel.parsed pkgenable kiss