From: Chris Gianelloni Date: Tue, 17 Apr 2007 16:18:58 +0000 (+0000) Subject: Added a patch from Andrew Gaffney on bug #174635 to fix a minor... X-Git-Tag: CATALYST_2_0_6_916~260 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=21c61bcbc5be7371168a762b4c9537e6db98517f;p=catalyst.git Added a patch from Andrew Gaffney on bug #174635 to fix a minor bug in System.map copying, add portage_overlay support, and adds the ability to use globbing in the package file lists for the netboot2 target. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1234 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index d7ef0bb7..79cae21e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 17 Apr 2007; Chris Gianelloni + modules/netboot2_target.py, targets/netboot2/netboot2-copyfile.sh, + targets/support/netboot2-final.sh: + Added a patch from Andrew Gaffney on bug #174635 to + fix a minor bug in System.map copying, add portage_overlay support, and adds + the ability to use globbing in the package file lists for the netboot2 + target. + 17 Apr 2007; Chris Gianelloni +targets/netboot2/nb-busybox.cf: Added nb-busybox.cf to the netboot2 target for bug #174298. diff --git a/modules/netboot2_target.py b/modules/netboot2_target.py index 3d7cbafe..3738062a 100644 --- a/modules/netboot2_target.py +++ b/modules/netboot2_target.py @@ -151,7 +151,7 @@ class netboot2_target(generic_stage_target): def set_action_sequence(self): self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", - "setup_confdir","bind","chroot_setup",\ + "setup_confdir","portage_overlay","bind","chroot_setup",\ "setup_environment","build_packages","root_overlay",\ "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ "remove","empty","unbind","clean","clear_autoresume"] diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh index 66dfd0af..0483cb40 100644 --- a/targets/netboot2/netboot2-copyfile.sh +++ b/targets/netboot2/netboot2-copyfile.sh @@ -9,7 +9,7 @@ echo ">>> Copying initramfs files to ${clst_merge_path} (in chroot) ..." for f in ${clst_files} do # copy it to the merge path - cp -pPRf --parents ${f} ${clst_merge_path} + cp -pPRf --parents $(eval echo ${f}) ${clst_merge_path} # if the file is an ELF binary, strip unneeded stuff from it if [ -x "${f}" ] && [ ! -L "${f}" ]; then diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh index 2cc9d57c..08f6e7b1 100755 --- a/targets/support/netboot2-final.sh +++ b/targets/support/netboot2-final.sh @@ -14,7 +14,7 @@ mkdir ${clst_target_path}kernels/misc for x in ${clst_boot_kernel}; do mv ${clst_target_path}boot/${x} ${clst_target_path}kernels mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc - mv ${clst_target_path}boot/System.map-${x} ${clst_target_path}kernels/misc + mv ${clst_target_path}boot/System.map* ${clst_target_path}kernels/misc/System.map-${x} done rmdir ${clst_target_path}boot