From: Chris Gianelloni Date: Wed, 5 Mar 2008 16:54:45 +0000 (+0000) Subject: Changed make_destpath to write out ROOT to make.conf, rather than (ab)using the envir... X-Git-Tag: CATALYST_2_0_6_916~141 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e1352785de476ce0cc3354d92d45825e75fbaec7;p=catalyst.git Changed make_destpath to write out ROOT to make.conf, rather than (ab)using the environment. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1353 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 7aedeac8..c15d7b61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 05 Mar 2008; Chris Gianelloni + targets/support/chroot-functions.sh: + Changed make_destpath to write out ROOT to make.conf, rather than (ab)using + the environment. + 05 Mar 2008; Chris Gianelloni catalyst, targets/support/kmerge.sh: Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/ diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index de90c1b4..b5b7e0ee 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -215,9 +215,10 @@ die() { make_destpath() { if [ "${1}" = "" ] then - export ROOT=/ + # ROOT is / by default, so remove any ROOT= settings from make.conf + sed -i '/ROOT=/d' /etc/make.conf else - export ROOT=${1} + echo "ROOT=\"${1}\"" >> /etc/make.conf if [ ! -d ${ROOT} ] then install -d ${ROOT}