[gentoo-commits] catalyst r1352 - in trunk: . targets/support

["Chris Gianelloni (wolf31o2)" <wolf31o2@gentoo.org>]

Author: wolf31o2
Date: 2008-03-05 16:12:29 +0000 (Wed, 05 Mar 2008)
New Revision: 1352

Modified:
   trunk/ChangeLog
   trunk/catalyst
   trunk/targets/support/kmerge.sh
Log:
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.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-04 02:37:23 UTC (rev 1351)
+++ trunk/ChangeLog	2008-03-05 16:12:29 UTC (rev 1352)
@@ -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:

Modified: trunk/catalyst
===================================================================
--- trunk/catalyst	2008-03-04 02:37:23 UTC (rev 1351)
+++ trunk/catalyst	2008-03-05 16:12:29 UTC (rev 1352)
@@ -8,7 +8,7 @@
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre10"
+__version__="2.0.6_pre11"
 
 conf_values={}
 

Modified: trunk/targets/support/kmerge.sh
===================================================================
--- trunk/targets/support/kmerge.sh	2008-03-04 02:37:23 UTC (rev 1351)
+++ trunk/targets/support/kmerge.sh	2008-03-05 16:12:29 UTC (rev 1352)
@@ -63,7 +63,6 @@
     then
         GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
     fi
-        
 }
 
 genkernel_compile(){
@@ -101,7 +100,8 @@
 	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 @@
 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

-- 
gentoo-commits@lists.gentoo.org mailing list