Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/ prior...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1352 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 58cb8e123257fc4af5ae57b013db4e2d2ade7db2..7aedeac819d11beccef97ab0539a2fccf96bd546 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/kmerge.sh:
+  Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/
+  prior to running genkernel. This is catalyst 2.0.6_pre11 for testing.
+
   04 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/create-iso.sh:
   Bash fscking sucks, so we have to compromise on this code reduction solution
@@ -12,7 +17,7 @@
 
   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
+  Pass clst_root_path instead of ROOT to run_merge, since it overrides ROOT
 
   29 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/kmerge.sh:

diff --git a/catalyst b/catalyst
index 2183a138b33a297369db510491aa81d2cd6e4d91..9be9d35e8c6bbcc7f12418e48da86ab5015974cb 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre10"
+__version__="2.0.6_pre11"
 
 conf_values={}
 

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 385a4d431a76e4a2c17c75b227e77eb10761021d..91050a38a291a5a2baeb6738668998bde834e4fb 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -63,7 +63,6 @@ setup_gk_args() {
     then
         GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
     fi
-        
 }
 
 genkernel_compile(){
@@ -101,7 +100,8 @@ genkernel_compile(){
        else
                genkernel ${GK_ARGS} || exit 1
        fi
-       md5sum /var/tmp/${clst_kname}.config|awk '{print $1}' > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
+       md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
+               /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
 }
 
 build_kernel() {
@@ -196,6 +196,7 @@ then
 else
        run_merge "${clst_ksource}" || exit 1
 fi
+make_destpath
 sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf
 
 # If catalyst has set to a empty string, extraversion wasn't specified so we