diff options
| author |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2013-08-02 00:46:51 -0400 |
|---|---|---|
| committer | Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2013-08-02 00:46:51 -0400 |
| commit | 6cd043fb865bf06ac5af8488dfd9b8c219b7aa20 (patch) | |
| tree | 591d7ca86f0690e9a24000b38d286d7e39c65b0b /targets | |
| parent | catalyst 2.0.13 (diff) | |
| download | catalyst-6cd043fb865bf06ac5af8488dfd9b8c219b7aa20.tar.gz catalyst-6cd043fb865bf06ac5af8488dfd9b8c219b7aa20.tar.bz2 catalyst-6cd043fb865bf06ac5af8488dfd9b8c219b7aa20.zip | |
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.
Diffstat (limited to 'targets')
| -rw-r--r-- | targets/support/kmerge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 364d2264..e78e0b49 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 };'` |