From 676d1c711ea6e73e0013cc23611b5736c10ee720 Mon Sep 17 00:00:00 2001 From: fake Date: Thu, 2 Feb 2006 12:36:36 +0000 Subject: [PATCH] fake: predefined pkgsels: oops, add -undef to cpp call, otherwise "linux" is replaced by "1" ;-) [2005120423031814582] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6951 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/config.in | 2 +- target/livecd/config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config.in b/scripts/config.in index c6843783c..86a879a13 100644 --- a/scripts/config.in +++ b/scripts/config.in @@ -209,7 +209,7 @@ expert_begin choice ROCKCFG_PKGSEL_TPL none none 'No package preselection template' \ $( cd misc/pkgsel; grep -H "^# TITLE: " *.in | tr ' ' '_' | sed 's,\.in:#_TITLE:_, ,' ) if [ -f misc/pkgsel/${ROCKCFG_PKGSEL_TPL}.in ]; then - cpp -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/${ROCKCFG_PKGSEL_TPL}.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed + cpp -undef -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/${ROCKCFG_PKGSEL_TPL}.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed . config/$config.$swpid/predefined-pkgsel.parsed fi bool 'Custom package selection' ROCKCFG_PKGSEL 0 diff --git a/target/livecd/config.in b/target/livecd/config.in index c0eaa7e9a..fe0bfeb95 100644 --- a/target/livecd/config.in +++ b/target/livecd/config.in @@ -61,7 +61,7 @@ ROCKCFGSET_PKG_LINUX_USE26MODTOOLS=1 ROCKCFGSET_PKG_SUBVERSION_STATIC=0 # hardwired for now... -cpp -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/minimal-desktop.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed +cpp -undef -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/minimal-desktop.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed . config/$config.$swpid/predefined-pkgsel.parsed pkgenable kiss