[gentoo-catalyst] [PATCH 06/17] Rename System.map in a way that it won't be matched if multiple kernel are used.

[Brian Dolbec <dolsen@gentoo.org>]

From: Guy Martin <gmsoft@gentoo.org>

The System.map-version file gets renamed to System.map-${kname}.
This causes some trouble when you have more than one kernel as the file from
the previous kernel will be matched as well. To prevent that, I change
the naming slightly.
---
 targets/support/functions.sh      | 4 ++--
 targets/support/netboot2-final.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 80e371c..b4335a5 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -106,9 +106,9 @@ extract_kernels() {
 			mv ${1}/initramfs-* ${1}/${x}.igz
 		fi
 
-		if [ -e ${1}/System.map-* ];
+		if [ -e ${1}/System.map-* ]
 		then
-			mv ${1}/System.map-* ${1}/System.map-${x}
+			mv ${1}/System.map-* ${1}/System-${x}.map
 		fi
 	done
 }
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..7f85538 100644
--- 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* ${clst_target_path}kernels/misc/System.map-${x}
+	mv ${clst_target_path}boot/System-${x}.map ${clst_target_path}kernels/misc
 done
 
 rmdir ${clst_target_path}boot
-- 
1.8.5.3