Added a patch from Andrew Gaffney <agaffney@gentoo.org> on bug #174635 to fix a minor...

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 d7ef0bb737929dd0854f94c0962d7ea2bbe308ca..79cae21e2a34f9d47529e2fb2bbc2fbf6c3a4d2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  17 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/netboot2_target.py, targets/netboot2/netboot2-copyfile.sh,
+  targets/support/netboot2-final.sh:
+  Added a patch from Andrew Gaffney <agaffney@gentoo.org> 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 <wolf31o2@gentoo.org>
   +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 3d7cbafee949e785ecee12eae6223c618a6babff..3738062a9f5e4f91a766e0a35cd4796e373d39ec 100644 (file)
--- 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 66dfd0af80b6b8cf85cee614c8c8ab09dc1a64a6..0483cb40be61d2519d39ab2e78bd7a288acd1512 100644 (file)
--- 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 2cc9d57c4cd1a896b648427b242f3ca5c79d16e8..08f6e7b16a2a96d8e588e161905113dc74779fb2 100755 (executable)
--- 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