| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-03-05 16:54:45 +0000 (Wed, 05 Mar 2008) |
| 3 |
New Revision: 1353 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/support/chroot-functions.sh |
| 8 |
Log: |
| 9 |
Changed make_destpath to write out ROOT to make.conf, rather than (ab)using the environment. |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-03-05 16:12:29 UTC (rev 1352) |
| 14 |
+++ trunk/ChangeLog 2008-03-05 16:54:45 UTC (rev 1353) |
| 15 |
@@ -1,6 +1,11 @@ |
| 16 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 17 |
# $Id: $ |
| 18 |
|
| 19 |
+ 05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
| 20 |
+ targets/support/chroot-functions.sh: |
| 21 |
+ Changed make_destpath to write out ROOT to make.conf, rather than (ab)using |
| 22 |
+ the environment. |
| 23 |
+ |
| 24 |
05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> catalyst, |
| 25 |
targets/support/kmerge.sh: |
| 26 |
Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/ |
| 27 |
|
| 28 |
Modified: trunk/targets/support/chroot-functions.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/support/chroot-functions.sh 2008-03-05 16:12:29 UTC (rev 1352) |
| 31 |
+++ trunk/targets/support/chroot-functions.sh 2008-03-05 16:54:45 UTC (rev 1353) |
| 32 |
@@ -215,9 +215,10 @@ |
| 33 |
make_destpath() { |
| 34 |
if [ "${1}" = "" ] |
| 35 |
then |
| 36 |
- export ROOT=/ |
| 37 |
+ # ROOT is / by default, so remove any ROOT= settings from make.conf |
| 38 |
+ sed -i '/ROOT=/d' /etc/make.conf |
| 39 |
else |
| 40 |
- export ROOT=${1} |
| 41 |
+ echo "ROOT=\"${1}\"" >> /etc/make.conf |
| 42 |
if [ ! -d ${ROOT} ] |
| 43 |
then |
| 44 |
install -d ${ROOT} |
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives