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 8c7e4f0db3bad499a22b860c5e416ffad9b208a1..6d7277ffd9972e52f40cb76f5f1156bb2edf3918 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  Change upgrade to update.
+
   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

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index d7437b98665a022b699a26aa5ec42b0d553aabda..06f0f4ad35028335df8faa9b020e8ed31789c9a8 100755 (executable)
--- 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