From: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
Date: Fri, 2 Aug 2013 04:46:51 +0000 (-0400)
Subject: Revert "kmerge.sh: Don't set USE=build for emerging kernels."
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cd043fb865bf06ac5af8488dfd9b8c219b7aa20;p=catalyst.git

Revert "kmerge.sh: Don't set USE=build for emerging kernels."

This appears to inadvertantly drop livecd-stage2 use flags entirely.

This reverts commit c0fcbf027169da8b6f0d5e3c80c1526642c6c672.
---

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 364d2264..e78e0b49 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -196,6 +196,9 @@ then
 	fi
 fi
 
+[ -e /etc/portage/make.conf ] && \
+	echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf
+
 if [ -n "${clst_KERNCACHE}" ]
 then
 	mkdir -p /tmp/kerncache/${clst_kname}
@@ -234,6 +237,7 @@ then
 fi
 
 build_kernel
+sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/make.conf
 # grep out the kernel version so that we can do our modules magic
 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`