[gentoo-commits] proj/catalyst:pending commit in: targets/support/

[Brian Dolbec]

commit:     23cd0ed7dc8ab4483bd34810d52309e90de5723a
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 13:21:21 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=23cd0ed7

netboot2.sh: Fix missing slashes in paths

 targets/support/netboot2-final.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/targets/support/netboot2-final.sh 
b/targets/support/netboot2-final.sh
index 94b86e1..ebd5187 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -4,20 +4,20 @@ source ${clst_shdir}/support/functions.sh
 source ${clst_shdir}/support/filesystem-functions.sh
 
 
-extract_kernels ${clst_target_path}boot
+extract_kernels ${clst_target_path}/boot
 
-# Move kernel binaries to ${clst_target_path}kernels, and
-# move everything else to ${clst_target_path}kernels/misc
-mkdir ${clst_target_path}kernels
-mkdir ${clst_target_path}kernels/misc
+# Move kernel binaries to ${clst_target_path}/kernels, and
+# move everything else to ${clst_target_path}/kernels/misc
+mkdir ${clst_target_path}/kernels
+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* 
${clst_target_path}kernels/misc/System.map-${x}
+       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-${x}.map 
${clst_target_path}/kernels/misc
 done
 
-rmdir ${clst_target_path}boot
+rmdir ${clst_target_path}/boot
 
 # Any post-processing necessary for each architecture can be done here.  This
 # may include things like sparc's elftoaout, x86's PXE boot, etc.
@@ -51,7 +51,7 @@ case ${clst_hostarch} in
                fi
                for x in ${clst_boot_kernel}; do
                        elftoaout ${clst_target_path}/kernels/${x} -o 
${clst_target_path}/${x}-a.out
-                       ${piggyback} ${clst_target_path}/${x}-a.out 
${clst_target_path}/kernels/misc/System-${x}.map 
${clst_target_path}/kernels/misc/${x}.igz
+                       ${piggyback} ${clst_target_path}/${x}-a.out 
${clst_target_path}/kernels/misc/System.map-${x} 
${clst_target_path}/kernels/misc/${x}.igz
                done
                ;;
        ia64)