Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Fri, 02 Aug 2013 05:27:03
Message-Id: 1375418951.4736819095355ae1bb6def60952f75505cc28518.zerochaos@gentoo
1 commit: 4736819095355ae1bb6def60952f75505cc28518
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 2 04:49:11 2013 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 2 04:49:11 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=47368190
7
8 correctly remove USE=build
9
10 c0fcbf027169da8b6f0d5e3c80c1526642c6c672 indavertantly dropped all
11 livecd-stage2 use flags, rewrite to just drop undesired build.
12
13 ---
14 targets/support/kmerge.sh | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
18 index e78e0b4..89e7132 100644
19 --- a/targets/support/kmerge.sh
20 +++ b/targets/support/kmerge.sh
21 @@ -197,7 +197,7 @@ then
22 fi
23
24 [ -e /etc/portage/make.conf ] && \
25 - echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf
26 + echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/make.conf
27
28 if [ -n "${clst_KERNCACHE}" ]
29 then
30 @@ -237,7 +237,7 @@ then
31 fi
32
33 build_kernel
34 -sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/make.conf
35 +sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" /etc/portage/make.conf
36 # grep out the kernel version so that we can do our modules magic
37 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
38 PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`