From 36c9e32202247f5a030c8872339c6e40cf61712f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 27 Mar 2008 04:58:57 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1382 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 2 +- targets/support/chroot-functions.sh | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0b37214..110edb9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 27 Mar 2008; Chris Gianelloni catalyst, + targets/support/chroot-functions.sh: + 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. + 27 Mar 2008; Chris Gianelloni livecd/files/README.txt: Added dosshd, passwd=, and nonfs to README.txt, since they were missing. diff --git a/catalyst b/catalyst index 01695ea5..13ff0b63 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.6_pre15" +__version__="2.0.6_pre16" conf_values={} diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 38a7af8f..041de496 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -64,7 +64,7 @@ setup_myfeatures(){ if [ -n "${clst_CCACHE}" ] then export clst_myfeatures="${clst_myfeatures} ccache" - clst_root_path=/ run_merge --oneshot --nodeps dev-util/ccache || exit 1 + clst_root_path=/ run_merge --oneshot --nodeps --noreplace dev-util/ccache || exit 1 fi if [ -n "${clst_DISTCC}" ] @@ -73,7 +73,7 @@ setup_myfeatures(){ export DISTCC_HOSTS="${clst_distcc_hosts}" [ -e /etc/make.conf ] && \ echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf - clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1 + clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf mkdir -p /etc/distcc echo "${clst_distcc_hosts}" > /etc/distcc/hosts @@ -91,7 +91,7 @@ setup_myfeatures(){ if [ -n "${clst_ICECREAM}" ] then - clst_root_path=/ run_merge --oneshot --nodeps sys-devel/icecream || exit 1 + clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/icecream || exit 1 # This sets up automatic cross-icecc-fu according to # http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling -- 2.26.2