Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1337 - in trunk: . targets/stage1
Date: Thu, 28 Feb 2008 04:47:32
Message-Id: E1JUag6-0000MQ-9U@stork.gentoo.org
1 Author: wolf31o2
2 Date: 2008-02-28 04:47:29 +0000 (Thu, 28 Feb 2008)
3 New Revision: 1337
4
5 Modified:
6 trunk/ChangeLog
7 trunk/targets/stage1/stage1-chroot.sh
8 Log:
9 Fix HOSTUSE invocation on stage1, since we use -* at the beginning to disable profile USE.
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2008-02-28 04:44:16 UTC (rev 1336)
14 +++ trunk/ChangeLog 2008-02-28 04:47:29 UTC (rev 1337)
15 @@ -2,6 +2,11 @@
16 # $Id: $
17
18 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
19 + targets/stage1/stage1-chroot.sh:
20 + Fix HOSTUSE invocation on stage1, since we use -* at the beginning to
21 + disable profile USE.
22 +
23 + 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
24 targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh:
25 OK, we have to escape our quotes, rather than use single quotes, or we don't
26 evaluate the variables properly.
27
28 Modified: trunk/targets/stage1/stage1-chroot.sh
29 ===================================================================
30 --- trunk/targets/stage1/stage1-chroot.sh 2008-02-28 04:44:16 UTC (rev 1336)
31 +++ trunk/targets/stage1/stage1-chroot.sh 2008-02-28 04:47:29 UTC (rev 1337)
32 @@ -28,7 +28,8 @@
33 sed -i '/USE="${USE} -build"/d' /etc/make.conf
34
35 [ -e /etc/make.conf ] && \
36 - echo "USE=\"-* bindist build ${STAGE1_USE} ${HOSTUSE}\"" >> /etc/make.conf
37 + echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \
38 + >> /etc/make.conf
39 run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}"
40 sed -i '/USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"/d' \
41 /etc/make.conf
42
43 --
44 gentoo-commits@l.g.o mailing list