From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2114A1381F3 for ; Tue, 30 Jul 2013 07:08:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3BBFE0AE4; Tue, 30 Jul 2013 07:08:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46BAAE0AE4 for ; Tue, 30 Jul 2013 07:08:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DC4833EAB6 for ; Tue, 30 Jul 2013 07:08:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B09AAE468F for ; Tue, 30 Jul 2013 07:08:43 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1375168095.c0fcbf027169da8b6f0d5e3c80c1526642c6c672.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c0fcbf027169da8b6f0d5e3c80c1526642c6c672 X-VCS-Branch: master Date: Tue, 30 Jul 2013 07:08:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e4877ddb-4a41-4090-9841-e2ce390f790a X-Archives-Hash: 353667d504fec145d19a9d66613c375c commit: c0fcbf027169da8b6f0d5e3c80c1526642c6c672 Author: Matt Turner gmail com> AuthorDate: Tue Jul 30 07:04:51 2013 +0000 Commit: Matt Turner gmail com> CommitDate: Tue Jul 30 07:08:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c0fcbf02 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 gmail.com> --- targets/support/kmerge.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index e78e0b4..364d226 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 };'`