From: Rick Farina (Zero_Chaos) Date: Fri, 2 Aug 2013 04:49:11 +0000 (-0400) Subject: correctly remove USE=build X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4736819095355ae1bb6def60952f75505cc28518;p=catalyst.git correctly remove USE=build c0fcbf027169da8b6f0d5e3c80c1526642c6c672 indavertantly dropped all livecd-stage2 use flags, rewrite to just drop undesired build. --- diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index e78e0b49..89e71325 100644 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -197,7 +197,7 @@ then fi [ -e /etc/portage/make.conf ] && \ - echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf + echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/make.conf if [ -n "${clst_KERNCACHE}" ] then @@ -237,7 +237,7 @@ then fi build_kernel -sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/make.conf +sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/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 };'`