From: Chris Gianelloni Date: Thu, 13 Mar 2008 16:10:20 +0000 (+0000) Subject: Change upgrade to update. X-Git-Tag: CATALYST_2_0_6_916~117 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=67ccf2f0674ee6996195b120dcc9e7f2c26e5f6f;p=catalyst.git Change upgrade to update. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1377 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 8c7e4f0d..6d7277ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Mar 2008; Chris Gianelloni + targets/support/kmerge.sh: + Change upgrade to update. + 13 Mar 2008; Chris Gianelloni targets/support/kmerge.sh: Add back in the package.provided code that *should* skip the kernel sources diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index d7437b98..06f0f4ad 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -189,7 +189,7 @@ fi 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 + clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge clst_myemergeopts="--quiet --nodeps --update --newuse" "${clst_ksource}" || exit 1 KERNELVERSION=`portageq best_visible / "${clst_ksource}"` if [ ! -e /etc/portage/profile/package.provided ] then