Gentoo Archives: gentoo-commits

From: "Andrew Gaffney (agaffney)" <agaffney@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1349 - in trunk: . targets/support
Date: Sun, 02 Mar 2008 05:26:02
Message-Id: E1JVghz-0007j1-Or@stork.gentoo.org
1 Author: agaffney
2 Date: 2008-03-02 05:25:58 +0000 (Sun, 02 Mar 2008)
3 New Revision: 1349
4
5 Modified:
6 trunk/ChangeLog
7 trunk/targets/support/kmerge.sh
8 Log:
9 Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2008-02-29 22:43:58 UTC (rev 1348)
14 +++ trunk/ChangeLog 2008-03-02 05:25:58 UTC (rev 1349)
15 @@ -1,6 +1,10 @@
16 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
17 # $Id: $
18
19 + 02 Mar 2008; Andrew Gaffney <agaffney@g.o>
20 + targets/support/kmerge.sh:
21 + Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT
22 +
23 29 Feb 2008; Andrew Gaffney <agaffney@g.o>
24 targets/support/kmerge.sh:
25 Use -L instead of -l in test for symlink
26
27 Modified: trunk/targets/support/kmerge.sh
28 ===================================================================
29 --- trunk/targets/support/kmerge.sh 2008-02-29 22:43:58 UTC (rev 1348)
30 +++ trunk/targets/support/kmerge.sh 2008-03-02 05:25:58 UTC (rev 1349)
31 @@ -189,8 +189,8 @@
32
33 if [ -n "${clst_KERNCACHE}" ]
34 then
35 -mkdir -p /tmp/kerncache/${clst_kname}
36 - ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb "${clst_ksource}" || exit 1
37 + mkdir -p /tmp/kerncache/${clst_kname}
38 + clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb "${clst_ksource}" || exit 1
39 [ -L /usr/src/linux ] && rm -f /usr/src/linux
40 ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
41 else
42
43 --
44 gentoo-commits@l.g.o mailing list