From 8fb885ff174f7299f0edddd987a357d45709b764 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 5 Mar 2008 16:12:29 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1352 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- catalyst | 2 +- targets/support/kmerge.sh | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58cb8e12..7aedeac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 05 Mar 2008; Chris Gianelloni 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 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 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 targets/support/kmerge.sh: diff --git a/catalyst b/catalyst index 2183a138..9be9d35e 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 385a4d43..91050a38 100755 --- 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 -- 2.26.2