1 |
Author: wolf31o2 |
2 |
Date: 2008-03-05 18:45:46 +0000 (Wed, 05 Mar 2008) |
3 |
New Revision: 1358 |
4 |
|
5 |
Modified: |
6 |
trunk/ChangeLog |
7 |
trunk/targets/stage1/stage1-chroot.sh |
8 |
trunk/targets/support/chroot-functions.sh |
9 |
Log: |
10 |
Updated make_destpath so it writes out to make.conf as well as exporting ROOT to the environment, added a make_destpath call to cleanup_stages, and adding make_destpath /tmp/stage1root to stage1. |
11 |
|
12 |
Modified: trunk/ChangeLog |
13 |
=================================================================== |
14 |
--- trunk/ChangeLog 2008-03-05 17:36:22 UTC (rev 1357) |
15 |
+++ trunk/ChangeLog 2008-03-05 18:45:46 UTC (rev 1358) |
16 |
@@ -1,6 +1,12 @@ |
17 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
18 |
# $Id: $ |
19 |
|
20 |
+ 05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
21 |
+ targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh: |
22 |
+ Updated make_destpath so it writes out to make.conf as well as exporting |
23 |
+ ROOT to the environment, added a make_destpath call to cleanup_stages, and |
24 |
+ adding make_destpath /tmp/stage1root to stage1. |
25 |
+ |
26 |
05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> README, catalyst: |
27 |
Updated README a bit and rolling 2.0.6_pre12 for testing. |
28 |
|
29 |
|
30 |
Modified: trunk/targets/stage1/stage1-chroot.sh |
31 |
=================================================================== |
32 |
--- trunk/targets/stage1/stage1-chroot.sh 2008-03-05 17:36:22 UTC (rev 1357) |
33 |
+++ trunk/targets/stage1/stage1-chroot.sh 2008-03-05 18:45:46 UTC (rev 1358) |
34 |
@@ -20,6 +20,7 @@ |
35 |
|
36 |
## START BUILD |
37 |
clst_root_path=/ setup_pkgmgr |
38 |
+make_destpath /tmp/stage1root |
39 |
|
40 |
# First, we drop in a known-good baselayout |
41 |
[ -e /etc/make.conf ] && \ |
42 |
|
43 |
Modified: trunk/targets/support/chroot-functions.sh |
44 |
=================================================================== |
45 |
--- trunk/targets/support/chroot-functions.sh 2008-03-05 17:36:22 UTC (rev 1357) |
46 |
+++ trunk/targets/support/chroot-functions.sh 2008-03-05 18:45:46 UTC (rev 1358) |
47 |
@@ -179,6 +179,7 @@ |
48 |
} |
49 |
|
50 |
cleanup_stages() { |
51 |
+ make_destpath |
52 |
if [ -n "${clst_DISTCC}" ] |
53 |
then |
54 |
cleanup_distcc |
55 |
@@ -213,17 +214,18 @@ |
56 |
} |
57 |
|
58 |
make_destpath() { |
59 |
- if [ "${1}" = "" ] |
60 |
+ # ROOT is / by default, so remove any ROOT= settings from make.conf |
61 |
+ sed -i '/ROOT=/d' /etc/make.conf |
62 |
+ export ROOT=/ |
63 |
+ if [ "${1}" != "/" -a -n "${1}" ] |
64 |
then |
65 |
- # ROOT is / by default, so remove any ROOT= settings from make.conf |
66 |
- sed -i '/ROOT=/d' /etc/make.conf |
67 |
- else |
68 |
echo "ROOT=\"${1}\"" >> /etc/make.conf |
69 |
- if [ ! -d ${ROOT} ] |
70 |
- then |
71 |
- install -d ${ROOT} |
72 |
- fi |
73 |
+ export ROOT=${1} |
74 |
fi |
75 |
+ if [ ! -d ${ROOT} ] |
76 |
+ then |
77 |
+ install -d ${ROOT} |
78 |
+ fi |
79 |
} |
80 |
|
81 |
run_merge() { |
82 |
|
83 |
-- |
84 |
gentoo-commits@l.g.o mailing list |