From: Eric Edgar Date: Thu, 26 Jan 2006 20:57:59 +0000 (+0000) Subject: kmerge should have been kerncache X-Git-Tag: CATALYST_2_0_6_916~449 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2639bd442b016fd0ad0eae62ea3680dfaf2f26fb;p=catalyst.git kmerge should have been kerncache git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1045 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 99b19960..26fffb92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.530 2006/01/26 20:14:42 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.531 2006/01/26 20:57:59 rocket Exp $ + + 26 Jan 2006; Eric Edgar targets/support/functions.sh: + kmerge should have been kerncache 26 Jan 2006; Eric Edgar targets/support/functions.sh, targets/support/pre-kmerge.sh: - -m Fix a few other places for the kerncache update + Fix a few other places for the kerncache update 26 Jan 2006; Eric Edgar examples/generic_stage_template.spec, examples/grp_template.spec, diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 3147eacf..01cea558 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -89,7 +89,7 @@ extract_kernels() { for x in ${clst_boot_kernel} do first=${first:-""} - kbinary="${clst_chroot_path}/tmp/kmerge/${x}-kernel-initrd-${clst_version_stamp}.tar.bz2" + kbinary="${clst_chroot_path}/tmp/kerncache/${x}-kernel-initrd-${clst_version_stamp}.tar.bz2" if [ -z "${first}" ] then # grab name of first kernel @@ -132,7 +132,7 @@ extract_kernels() { extract_modules() { # $1 = Destination # $2 = kname - kmodules="${clst_chroot_path}/tmp/kmerge/${2}-modules-${clst_version_stamp}.tar.bz2" + kmodules="${clst_chroot_path}/tmp/kerncache/${2}-modules-${clst_version_stamp}.tar.bz2" if [ -f "${kmodules}" ] then @@ -146,7 +146,7 @@ extract_kernel() { # $1 = Destination # $2 = kname - kbinary="${clst_chroot_path}/tmp/kmerge/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2" + kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2" [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" mkdir -p ${1}/ tar xjf ${kbinary} -C ${1}/