From 78020755dec74f4bebb98e88551b600791680f18 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 15 Apr 2005 16:49:45 +0000 Subject: [PATCH] Fixes for initramfs overlay support. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@606 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 7 ++++--- targets/support/kmerge.sh | 10 +++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b752c6a..3957a6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.221 2005/04/15 04:43:17 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.222 2005/04/15 16:49:45 rocket Exp $ + + 15 Apr 2005; Eric Edgar + modules/generic_stage_target.py, targets/support/kmerge.sh: + Fixes for initramfs overlay support. 15 Apr 2005; Eric Edgar modules/generic_stage_target.py, targets/support/kmerge.sh, diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 7b943555..5c1c23a9 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.31 2005/04/15 04:40:24 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.32 2005/04/15 16:49:45 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -873,8 +873,10 @@ class generic_stage_target(generic_target): if self.settings.has_key("boot/kernel/"+kname+"/initramfs_overlay"): if os.path.exists(self.settings["boot/kernel/"+kname+"/initramfs_overlay"]): print "Copying initramfs_overlay dir " +self.settings["boot/kernel/"+kname+"/initramfs_overlay"] + cmd("mkdir -p "+self.settings["chroot_path"]+"/tmp/initramfs_overlay/" + \ self.settings["boot/kernel/"+kname+"/initramfs_overlay"]) + cmd("cp -R "+self.settings["boot/kernel/"+kname+"/initramfs_overlay"]+"/* " + \ self.settings["chroot_path"] + "/tmp/initramfs_overlay/" + \ self.settings["boot/kernel/"+kname+"/initramfs_overlay"]) @@ -886,8 +888,7 @@ class generic_stage_target(generic_target): if self.settings.has_key("boot/kernel/"+kname+"/initramfs_overlay"): print "Cleaning up temporary overlay dir" - cmd("rm -R"+self.settings["chroot_path"]+"/tmp/initramfs_overlay/" + \ - self.settings["boot/kernel/"+kname+"/initramfs_overlay"]) + cmd("rm -R "+self.settings["chroot_path"]+"/tmp/initramfs_overlay/") touch(self.settings["autoresume_path"]+"build_kernel") diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index dd8abf54..1fb19d30 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -33,7 +33,7 @@ setup_gk_args() { if [ -n "${clst_initramfs_overlay}" ] then - GK_ARGS="${GK_ARGS} --initramfs_overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}" + GK_ARGS="${GK_ARGS} --initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}" fi if [ -n "${clst_CCACHE}" ] then @@ -47,11 +47,15 @@ setup_gk_args() { } genkernel_compile(){ - - setup_gk_args + eval "clst_initramfs_overlay=\$clst_boot_kernel_${clst_kname}_initramfs_overlay" eval "clst_kernel_merge=\$clst_boot_kernel_${clst_kname}_packages" + + setup_gk_args + #echo "The GK_ARGS are" + #echo ${GK_ARGS} export clst_kernel_merge + export clst_initramfs_overlay # build with genkernel using the set options # callback is put here to avoid escaping issues if [ -n "${clst_KERNCACHE}" ] -- 2.26.2