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 364d226441042d69d86d6caca1145a3fc3795d6d..e78e0b494e4d5db8a8dd765915e46c5fa157eaab 100644 (file)
--- 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 };'`