From: Sebastian Pipping Date: Sat, 25 Jun 2011 18:35:56 +0000 (+0200) Subject: Add "-news" to FEATURES everywhere X-Git-Tag: CATALYST_2_0_6_917~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a10f33d643543aedf22bba9947d099de9996c1d;p=catalyst.git Add "-news" to FEATURES everywhere --- diff --git a/ChangeLog b/ChangeLog index 61dc5b2a..ea5b5677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ # Distributed under the GPL v2 # $Id$ + 25 Jun 2011; Sebastian Pipping + targets/netboot/netboot-combine.sh, targets/stage1/stage1-chroot.sh, + targets/stage2/stage2-chroot.sh, targets/support/chroot-functions.sh: + Add "-news" to FEATURES everywhere + 25 Jun 2011; Matt Turner targets/support/chroot-functions.sh: Use get_libdir instead of hard-coding lib for distcc diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index c3ab2ec3..74d36c97 100644 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -7,7 +7,7 @@ source /tmp/chroot-functions.sh # Setup our environment STAGE1_USE="$(portageq envvar STAGE1_USE)" -FEATURES="${clst_myfeatures} nodoc noman noinfo" +FEATURES="${clst_myfeatures} nodoc noman noinfo -news" ## Sanity check profile if [ -z "${clst_buildpkgs}" ] diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index ca86d901..109d4af1 100644 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-chroot.sh @@ -3,7 +3,7 @@ source /tmp/chroot-functions.sh # Setup the environment -export FEATURES="${clst_myfeatures} nodoc noman noinfo" +export FEATURES="${clst_myfeatures} nodoc noman noinfo -news" if [ "${clst_VERBOSE}" ] then diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index caaa576b..8b03f6cb 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -116,7 +116,7 @@ setup_myfeatures(){ export PATH="/usr/lib/icecc/bin:${PATH}" export PREROOTPATH="/usr/lib/icecc/bin" fi - export FEATURES="${clst_myfeatures}" + export FEATURES="${clst_myfeatures} -news" } setup_myemergeopts(){