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

diff --git a/ChangeLog b/ChangeLog
index 6dc8ce02c00b2aa54727bd1ce8364186f5d3055e..2ce613a997594ebe4d17ccd82e2235f1d097127e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  02 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/kmerge.sh:
+  Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT
+
   29 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 82820a0594e915fce22bb448a079e7ab8a68220f..385a4d431a76e4a2c17c75b227e77eb10761021d 100755 (executable)
--- 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