From 849f48d8486aee7c8d4c4441ec678e79ec0e05f4 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 13 Mar 2008 18:20:27 +0000 Subject: [PATCH] It helps if I put things in the correct order so they'll actually execute, rather than getting a nice error from emerge. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1378 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/support/kmerge.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6d7277ff..07c8766d 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: + It helps if I put things in the correct order so they'll actually execute, + rather than getting a nice error from emerge. + 13 Mar 2008; Chris Gianelloni targets/support/kmerge.sh: Change upgrade to update. diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 06f0f4ad..b0e6fc7b 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 --update --newuse" "${clst_ksource}" || exit 1 + clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1 KERNELVERSION=`portageq best_visible / "${clst_ksource}"` if [ ! -e /etc/portage/profile/package.provided ] then -- 2.26.2