| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-03-27 04:58:57 +0000 (Thu, 27 Mar 2008) |
| 3 |
New Revision: 1382 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/catalyst |
| 8 |
trunk/targets/support/chroot-functions.sh |
| 9 |
Log: |
| 10 |
Added --noreplace to setup_myfeatures merges so we don't blow away any packages which are already installed with the proper USE flags for the given target. This is for bug #211654. This is catalyst 2.0.6_pre16 for testing. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2008-03-27 04:51:24 UTC (rev 1381) |
| 15 |
+++ trunk/ChangeLog 2008-03-27 04:58:57 UTC (rev 1382) |
| 16 |
@@ -1,6 +1,12 @@ |
| 17 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 18 |
# $Id: $ |
| 19 |
|
| 20 |
+ 27 Mar 2008; Chris Gianelloni <wolf31o2@g.o> catalyst, |
| 21 |
+ targets/support/chroot-functions.sh: |
| 22 |
+ Added --noreplace to setup_myfeatures merges so we don't blow away any |
| 23 |
+ packages which are already installed with the proper USE flags for the given |
| 24 |
+ target. This is for bug #211654. This is catalyst 2.0.6_pre16 for testing. |
| 25 |
+ |
| 26 |
27 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
| 27 |
livecd/files/README.txt: |
| 28 |
Added dosshd, passwd=, and nonfs to README.txt, since they were missing. |
| 29 |
|
| 30 |
Modified: trunk/catalyst |
| 31 |
=================================================================== |
| 32 |
--- trunk/catalyst 2008-03-27 04:51:24 UTC (rev 1381) |
| 33 |
+++ trunk/catalyst 2008-03-27 04:58:57 UTC (rev 1382) |
| 34 |
@@ -8,7 +8,7 @@ |
| 35 |
import pdb |
| 36 |
|
| 37 |
__maintainer__="Chris Gianelloni <wolf31o2@g.o>" |
| 38 |
-__version__="2.0.6_pre15" |
| 39 |
+__version__="2.0.6_pre16" |
| 40 |
|
| 41 |
conf_values={} |
| 42 |
|
| 43 |
|
| 44 |
Modified: trunk/targets/support/chroot-functions.sh |
| 45 |
=================================================================== |
| 46 |
--- trunk/targets/support/chroot-functions.sh 2008-03-27 04:51:24 UTC (rev 1381) |
| 47 |
+++ trunk/targets/support/chroot-functions.sh 2008-03-27 04:58:57 UTC (rev 1382) |
| 48 |
@@ -64,7 +64,7 @@ |
| 49 |
if [ -n "${clst_CCACHE}" ] |
| 50 |
then |
| 51 |
export clst_myfeatures="${clst_myfeatures} ccache" |
| 52 |
- clst_root_path=/ run_merge --oneshot --nodeps dev-util/ccache || exit 1 |
| 53 |
+ clst_root_path=/ run_merge --oneshot --nodeps --noreplace dev-util/ccache || exit 1 |
| 54 |
fi |
| 55 |
|
| 56 |
if [ -n "${clst_DISTCC}" ] |
| 57 |
@@ -73,7 +73,7 @@ |
| 58 |
export DISTCC_HOSTS="${clst_distcc_hosts}" |
| 59 |
[ -e /etc/make.conf ] && \ |
| 60 |
echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf |
| 61 |
- clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1 |
| 62 |
+ clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 |
| 63 |
sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf |
| 64 |
mkdir -p /etc/distcc |
| 65 |
echo "${clst_distcc_hosts}" > /etc/distcc/hosts |
| 66 |
@@ -91,7 +91,7 @@ |
| 67 |
|
| 68 |
if [ -n "${clst_ICECREAM}" ] |
| 69 |
then |
| 70 |
- clst_root_path=/ run_merge --oneshot --nodeps sys-devel/icecream || exit 1 |
| 71 |
+ clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/icecream || exit 1 |
| 72 |
|
| 73 |
# This sets up automatic cross-icecc-fu according to |
| 74 |
# http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling |
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives