Added clst_HOSTUSE to livecd-stage1 and livecd-stage2 package builds.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1276 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index f18ddd238eedc6aef2d100754fc235e1c74af393..1d9311a7048f56253c6e0c42e9797b7dd2deace3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage1/livecd-stage1-chroot.sh, targets/support/kmerge.sh:
+  Added clst_HOSTUSE to livecd-stage1 and livecd-stage2 package builds.
+
   06 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py:
   Added prescott to the subarches for x86.
 

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 13b2074a3abebf53076c17f70b75cd012246cd64..023e6617ecf33f6e312fc2f0945acfe734aa0fb5 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -13,6 +13,6 @@ export FEATURES="${clst_myfeatures}"
 ## START BUILD
 setup_portage
 
-export USE="${clst_use}"
+export USE="${clst_use} ${clst_HOSTUSE}"
 
 run_emerge "${clst_packages}"

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 5cdd418c3b4b1e300f88ad2b520aeb36a5e1f271..d2408d65b179ad1147abb37acd1c78a26eaaedbb 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -109,15 +109,14 @@ export CONFIG_PROTECT="-*"
 
 # Set the timezone for the kernel build
 rm /etc/localtime
-ln -s /usr/share/zoneinfo/UTC /etc/localtime
-
+cp -f /usr/share/zoneinfo/UTC /etc/localtime
 
 filtered_kname=${clst_kname/-/_}
 filtered_kname=${clst_kname/\//_}
 filtered_kname=${filtered_kname/\./_}
 
 eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"
-export USE=$clst_kernel_use
+export USE="${clst_kernel_use} ${clst_HOSTUSE}"
 
 eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs"
 eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources"