From: Matt Turner Date: Tue, 30 Jul 2013 07:04:51 +0000 (-0700) Subject: kmerge.sh: Don't set USE=build for emerging kernels. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0fcbf027169da8b6f0d5e3c80c1526642c6c672;p=catalyst.git kmerge.sh: Don't set USE=build for emerging kernels. USE=build for kernels means that they're not going to be built and that we just want to install the sources. In catalyst, we do also want to build the kernels, so settings the (badly named) USE flag prevents installing sys-devel/bc, ultimately leading to the kernel build failing. Remove USE=build from kmerge.sh and let it install dependencies necessary for actually building the kernel. Fixes Live CD builds with kernels that require bc (>= 3.9, I believe). See bug 478244. Tested-by: Ben Kohler --- diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index e78e0b49..364d2264 100644 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -196,9 +196,6 @@ 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} @@ -237,7 +234,6 @@ 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 };'`