From c140ceed0b6208c0f3432c3184781ae1f0d3829e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 13 Mar 2008 14:48:19 +0000 Subject: [PATCH] Add back in the package.provided code that *should* skip the kernel sources merge for call back and subsequent runs. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1376 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/support/kmerge.sh | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 08e94f0f..8c7e4f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Mar 2008; Chris Gianelloni + 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 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 4756b563..d7437b98 100755 --- 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 -- 2.26.2