aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2011-06-25 20:38:38 +0200
committerSebastian Pipping <sebastian@pipping.org>2011-06-25 20:38:38 +0200
commit60068996b501a4fa8e9780c6119bf21c31f1fe50 (patch)
tree37fc3efce23a3fefc5630c784cd1d924984a1eea
parentAdd sh4aeb (diff)
downloadcatalyst-60068996b501a4fa8e9780c6119bf21c31f1fe50.tar.gz
catalyst-60068996b501a4fa8e9780c6119bf21c31f1fe50.tar.bz2
catalyst-60068996b501a4fa8e9780c6119bf21c31f1fe50.zip
Add "-news" to FEATURES everywhere
-rw-r--r--ChangeLog5
-rw-r--r--targets/stage1/stage1-chroot.sh2
-rw-r--r--targets/stage2/stage2-chroot.sh2
-rw-r--r--targets/support/chroot-functions.sh2
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cfcb11..b4f2407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
# Distributed under the GPL v2
# $Id$
+ 25 Jun 2011; Sebastian Pipping <sping@gentoo.org>
+ targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
+ targets/support/chroot-functions.sh:
+ Add "-news" to FEATURES everywhere
+
25 Jun 2011; Raúl Porcel <armin76@gentoo.org> modules/catalyst/arch/sh.py:
Add sh4aeb
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index c3ab2ec..74d36c9 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 ca86d90..109d4af 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 395a91c..0d8b76e 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(){