From c916f8dfa2e1774861061ab0be6cca2257c5f8ba Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Sun, 11 Dec 2005 20:34:42 +0000 Subject: [PATCH] Add support for bootloader softlevel=; have rsync delete the extra files out of the overlay so that the overlay always matches the source dir git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@962 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- modules/generic_stage_target.py | 7 +++++-- targets/support/bootloader-setup.sh | 9 ++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c60ef474..b33416bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.449 2005/12/09 22:38:43 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.450 2005/12/11 20:34:41 rocket Exp $ + + 11 Dec 2005; Eric Edgar + modules/generic_stage_target.py, targets/support/bootloader-setup.sh: + Add support for bootloader softlevel=; have rsync delete the extra files out + of the overlay so that the overlay always matches the source dir 09 Dec 2005; Chris Gianelloni catalyst: Swapped -v/-V since I had gotten them wrong here. diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index e2546715..6c55e7cb 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.96 2005/12/09 20:47:05 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.97 2005/12/11 20:34:42 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -437,6 +437,7 @@ class generic_stage_target(generic_target): self.valid_values.append("boot/kernel/"+x+"/gk_kernargs") self.valid_values.append("boot/kernel/"+x+"/gk_action") self.valid_values.append("boot/kernel/"+x+"/initramfs_overlay") + self.valid_values.append("boot/kernel/"+x+"/softlevel") if self.settings.has_key("boot/kernel/"+x+"/postconf"): print "boot/kernel/"+x+"/postconf is deprecated" print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages" @@ -691,7 +692,9 @@ class generic_stage_target(generic_target): if os.path.exists(x): print "Copying overlay dir " +x cmd("mkdir -p "+self.settings["chroot_path"]+x,"Could not make portage_overlay dir",env=self.env) - cmd("cp -R "+x+"/* "+self.settings["chroot_path"]+x,"Could not copy portage_overlay",env=self.env) + cmd("rsync -a --delete "+x+"/* "+self.settings["chroot_path"]+x,\ + "Could not copy portage_overlay",env=self.env) + #cmd("cp -R "+x+"/* "+self.settings["chroot_path"]+x,"Could not copy portage_overlay",env=self.env) def root_overlay(self): # copy over the root_overlay diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 33e7fc39..8532c56c 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.20 2005/11/30 21:34:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.21 2005/12/11 20:34:42 rocket Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -13,8 +13,15 @@ check_dev_manager check_bootargs check_filesystem_type +eval "clst_kernel_softlevel=\$clst_boot_kernel_${clst_kname}_softlevel" + default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" +if ${clst_kernel_softlevel} +then + default_append_line="${default_append_line} softlevel=${clst_kernel_softlevel}" +fi + case ${clst_mainarch} in alpha) acfg=$1/etc/aboot.conf -- 2.26.2