| 1 |
commit: 6cd043fb865bf06ac5af8488dfd9b8c219b7aa20 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 2 04:46:51 2013 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 2 04:46:51 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6cd043fb |
| 7 |
|
| 8 |
Revert "kmerge.sh: Don't set USE=build for emerging kernels." |
| 9 |
|
| 10 |
This appears to inadvertantly drop livecd-stage2 use flags entirely. |
| 11 |
|
| 12 |
This reverts commit c0fcbf027169da8b6f0d5e3c80c1526642c6c672. |
| 13 |
|
| 14 |
--- |
| 15 |
targets/support/kmerge.sh | 4 ++++ |
| 16 |
1 file changed, 4 insertions(+) |
| 17 |
|
| 18 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 19 |
index 364d226..e78e0b4 100644 |
| 20 |
--- a/targets/support/kmerge.sh |
| 21 |
+++ b/targets/support/kmerge.sh |
| 22 |
@@ -196,6 +196,9 @@ then |
| 23 |
fi |
| 24 |
fi |
| 25 |
|
| 26 |
+[ -e /etc/portage/make.conf ] && \ |
| 27 |
+ echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf |
| 28 |
+ |
| 29 |
if [ -n "${clst_KERNCACHE}" ] |
| 30 |
then |
| 31 |
mkdir -p /tmp/kerncache/${clst_kname} |
| 32 |
@@ -234,6 +237,7 @@ then |
| 33 |
fi |
| 34 |
|
| 35 |
build_kernel |
| 36 |
+sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/make.conf |
| 37 |
# grep out the kernel version so that we can do our modules magic |
| 38 |
VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` |
| 39 |
PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` |
Archives