From f1b2e0bd1f5028ee6a4ea37f5ccffa3cf861bce9 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 2 Mar 2008 05:25:58 +0000 Subject: [PATCH] Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1349 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 4 ++++ targets/support/kmerge.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dc8ce02..2ce613a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 02 Mar 2008; Andrew Gaffney + targets/support/kmerge.sh: + Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT + 29 Feb 2008; Andrew Gaffney targets/support/kmerge.sh: Use -L instead of -l in test for symlink diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 82820a05..385a4d43 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -189,8 +189,8 @@ fi if [ -n "${clst_KERNCACHE}" ] then -mkdir -p /tmp/kerncache/${clst_kname} - ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb "${clst_ksource}" || exit 1 + mkdir -p /tmp/kerncache/${clst_kname} + clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb "${clst_ksource}" || exit 1 [ -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