From 0d9102dae6da562fddc6cfc0269147893220e584 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Feb 2008 22:16:41 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ targets/livecd-stage1/livecd-stage1-chroot.sh | 2 +- targets/support/kmerge.sh | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f18ddd23..1d9311a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Feb 2008; Chris Gianelloni + 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 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 13b2074a..023e6617 100755 --- 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 5cdd418c..d2408d65 100755 --- 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" -- 2.26.2