Add back in the package.provided code that *should* skip the kernel sources merge...

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

diff --git a/ChangeLog b/ChangeLog
index 08e94f0f5ea734fe93130d88bdfec32c724b0f52..8c7e4f0db3bad499a22b860c5e416ffad9b208a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  Add back in the package.provided code that *should* skip the kernel sources
+  merge for call back and subsequent runs.
+
   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

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 4756b563f182d4d2878998e727520256f93126df..d7437b98665a022b699a26aa5ec42b0d553aabda 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -190,6 +190,17 @@ if [ -n "${clst_KERNCACHE}" ]
 then
        mkdir -p /tmp/kerncache/${clst_kname}
        clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge clst_myemergeopts="--quiet --nodeps --upgrade --newuse"  "${clst_ksource}" || exit 1
+       KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
+       if [ ! -e /etc/portage/profile/package.provided ]
+       then
+               mkdir -p /etc/portage/profile
+               echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
+       else
+               if ( ! grep -q "^${KERNELVERSION}"  /etc/portage/profile/package.provided ) 
+               then
+                       echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
+               fi
+       fi
        [ -L /usr/src/linux ] && rm -f /usr/src/linux
        ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
 else