From fc789f3c2c7c70300a193f90b3d9165898d22da2 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sat, 27 Dec 2003 20:03:40 +0000 Subject: [PATCH] fixed config.in to not discard packages too early git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2072 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + scripts/config.in | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 518b57980..26b51a164 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -2,6 +2,7 @@ *) 2003-12-27 (2.0.0-rc3 - 2.0.0-rc4) - Valentin Ziegler: updated flex (2.5.31) + - fixed config.in to not discard packages too early *) 2003-12-25 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/scripts/config.in b/scripts/config.in index 5da311ebe..a7b338f34 100644 --- a/scripts/config.in +++ b/scripts/config.in @@ -139,8 +139,9 @@ block_begin 7 then . architecture/$ROCKCFG_ARCH/config.in ; fi bool 'This is a cross-build between architectures' ROCKCFG_CROSSBUILD 0 if [ "$ROCKCFG_CROSSBUILD" = 1 ] ; then - sed 's,^\(. ..\)[^ ]*,\1--------,' < config/$config/packages | - grep -vx '. --* .*' > config/$config/packages.new + sed -e 's,^\(. ..\)[^ ]*,\1--------,' \ + < config/$config/packages \ + > config/$config/packages.new mv config/$config/packages.new config/$config/packages ROCKCFG_ID="$ROCKCFG_ID-cross" ; ROCKCFGSET_USE_CROSSCC=1 fi