We don't really need to use binary packages for the kernel sources, since it doesn...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1375 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index eba620c84138fad38c934fd6beb21f38fcbd0216..08e94f0f5ea734fe93130d88bdfec32c724b0f52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  We don't really need to use binary packages for the kernel sources, since it
+  doesn't gain us anything. Also, we need to delete the /usr/src/linux symlink
+  when we're not using kerncache.
+
   13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/kmerge.sh:
   Remove 'symlink' from USE, since it's not needed and screws up kerncache

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c14283cecd016a68e41b0c5891250c66f4d9a8e6..4756b563f182d4d2878998e727520256f93126df 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -189,10 +189,11 @@ fi
 if [ -n "${clst_KERNCACHE}" ]
 then
        mkdir -p /tmp/kerncache/${clst_kname}
-       clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb  "${clst_ksource}" || exit 1
+       clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge clst_myemergeopts="--quiet --nodeps --upgrade --newuse"  "${clst_ksource}" || exit 1
        [ -L /usr/src/linux ] && rm -f /usr/src/linux
        ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
 else
+       [ -L /usr/src/linux ] && rm -f /usr/src/linux
        run_merge "${clst_ksource}" || exit 1
 fi
 make_destpath