Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1276 - in trunk: . targets/livecd-stage1 targets/support
Date: Wed, 06 Feb 2008 22:16:44
Message-Id: E1JMsZO-0005Px-7n@stork.gentoo.org
1 Author: wolf31o2
2 Date: 2008-02-06 22:16:41 +0000 (Wed, 06 Feb 2008)
3 New Revision: 1276
4
5 Modified:
6 trunk/ChangeLog
7 trunk/targets/livecd-stage1/livecd-stage1-chroot.sh
8 trunk/targets/support/kmerge.sh
9 Log:
10 Added clst_HOSTUSE to livecd-stage1 and livecd-stage2 package builds.
11
12 Modified: trunk/ChangeLog
13 ===================================================================
14 --- trunk/ChangeLog 2008-02-06 22:08:38 UTC (rev 1275)
15 +++ trunk/ChangeLog 2008-02-06 22:16:41 UTC (rev 1276)
16 @@ -1,6 +1,10 @@
17 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
18 # $Id: $
19
20 + 06 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
21 + targets/livecd-stage1/livecd-stage1-chroot.sh, targets/support/kmerge.sh:
22 + Added clst_HOSTUSE to livecd-stage1 and livecd-stage2 package builds.
23 +
24 06 Feb 2008; Chris Gianelloni <wolf31o2@g.o> arch/x86.py:
25 Added prescott to the subarches for x86.
26
27
28 Modified: trunk/targets/livecd-stage1/livecd-stage1-chroot.sh
29 ===================================================================
30 --- trunk/targets/livecd-stage1/livecd-stage1-chroot.sh 2008-02-06 22:08:38 UTC (rev 1275)
31 +++ trunk/targets/livecd-stage1/livecd-stage1-chroot.sh 2008-02-06 22:16:41 UTC (rev 1276)
32 @@ -13,6 +13,6 @@
33 ## START BUILD
34 setup_portage
35
36 -export USE="${clst_use}"
37 +export USE="${clst_use} ${clst_HOSTUSE}"
38
39 run_emerge "${clst_packages}"
40
41 Modified: trunk/targets/support/kmerge.sh
42 ===================================================================
43 --- trunk/targets/support/kmerge.sh 2008-02-06 22:08:38 UTC (rev 1275)
44 +++ trunk/targets/support/kmerge.sh 2008-02-06 22:16:41 UTC (rev 1276)
45 @@ -109,15 +109,14 @@
46
47 # Set the timezone for the kernel build
48 rm /etc/localtime
49 -ln -s /usr/share/zoneinfo/UTC /etc/localtime
50 +cp -f /usr/share/zoneinfo/UTC /etc/localtime
51
52 -
53 filtered_kname=${clst_kname/-/_}
54 filtered_kname=${clst_kname/\//_}
55 filtered_kname=${filtered_kname/\./_}
56
57 eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"
58 -export USE=$clst_kernel_use
59 +export USE="${clst_kernel_use} ${clst_HOSTUSE}"
60
61 eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs"
62 eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources"
63
64 --
65 gentoo-commits@l.g.o mailing list