Fix a few other places for the kerncache update

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

diff --git a/ChangeLog b/ChangeLog
index 1ad87e4133c4dc31f3ac0c404eabc9a65672b448..99b1996053dcf8f9086d434013a4f592399f000d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.529 2006/01/26 19:56:32 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.530 2006/01/26 20:14:42 rocket Exp $
+
+  26 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh,
+  targets/support/pre-kmerge.sh:
+  -m Fix a few other places for the kerncache update
 
   26 Jan 2006; Eric Edgar <rocket@gentoo.org>
   examples/generic_stage_template.spec, examples/grp_template.spec,

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index ff39a6acdacffb60a4a4ed25f17a841b6cafb17a..3147eacf883b32f197691d37e837c9e3a48e7036 100755 (executable)
--- 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}/usr/portage/packages/gk_binaries/${x}-kernel-initrd-${clst_version_stamp}.tar.bz2"
+               kbinary="${clst_chroot_path}/tmp/kmerge/${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}/usr/portage/packages/gk_binaries/${2}-modules-${clst_version_stamp}.tar.bz2"
+       kmodules="${clst_chroot_path}/tmp/kmerge/${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}/usr/portage/packages/gk_binaries/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2"
+       kbinary="${clst_chroot_path}/tmp/kmerge/${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}/

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 3e7cae085b9cf9f83529f9c6ec68bae6def6739d..1dba443af3bc96ab305be11497cf2c34fa2b6e0d 100755 (executable)
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -10,7 +10,7 @@ case ${clst_target} in
        livecd*|stage4)
                export USE="livecd"
                run_emerge --oneshot genkernel
-               install -d /usr/portage/packages/gk_binaries
+               install -d /tmp/kerncache
 
                # Setup case structure for livecd_type
                case ${clst_livecd_type} in
@@ -27,7 +27,7 @@ case ${clst_target} in
 
        netboot2)
                run_emerge --oneshot genkernel
-               install -d /usr/portage/packages/gk_binaries
+               install -d /tmp/kerncache
 
                # Set the netboot builddate/hostname in linuxrc & copy to proper arch directory in genkernel
                sed -e "s/@@MYDATE@@/${clst_netboot2_builddate}/g" \