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 37E321381F3 for ; Fri, 2 Aug 2013 05:27:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C82D4E0A5C; Fri, 2 Aug 2013 05:27:02 +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 5DFB3E0A5C for ; Fri, 2 Aug 2013 05:27:02 +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 7141733EAF6 for ; Fri, 2 Aug 2013 05:27:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C70A1E468F for ; Fri, 2 Aug 2013 05:26:59 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1375418811.6cd043fb865bf06ac5af8488dfd9b8c219b7aa20.zerochaos@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: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 6cd043fb865bf06ac5af8488dfd9b8c219b7aa20 X-VCS-Branch: master Date: Fri, 2 Aug 2013 05:26:59 +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: 393f318e-1dbc-4b53-8603-e8234aac8085 X-Archives-Hash: 2fafdf45fdb9c6ab3da6621e8d8245f4 commit: 6cd043fb865bf06ac5af8488dfd9b8c219b7aa20 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Fri Aug 2 04:46:51 2013 +0000 Commit: Richard Farina gentoo org> CommitDate: Fri Aug 2 04:46:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6cd043fb 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. --- targets/support/kmerge.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 364d226..e78e0b4 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 };'`