Gentoo Archives: gentoo-catalyst

From: Guy Martin <gmsoft@g.o>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH 05/11] Rename System.map in a way that it won't be matched if multiple kernel are used.
Date: Wed, 05 Feb 2014 10:40:22
Message-Id: 1391596806-14955-6-git-send-email-gmsoft@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 00/11] Livecd updates for catalyst 3.0 by Guy Martin
1 The System.map-version file gets renamed to System.map-${kname}.
2 This causes some trouble when you have more than one kernel as the file from
3 the previous kernel will be matched as well. To prevent that, I change
4 the naming slightly.
5
6 ---
7 targets/support/functions.sh | 4 ++--
8 targets/support/netboot2-final.sh | 2 +-
9 2 files changed, 3 insertions(+), 3 deletions(-)
10
11 diff --git a/targets/support/functions.sh b/targets/support/functions.sh
12 index 224833f..7face15 100755
13 --- a/targets/support/functions.sh
14 +++ b/targets/support/functions.sh
15 @@ -106,9 +106,9 @@ extract_kernels() {
16 mv ${1}/initramfs-* ${1}/${x}.igz
17 fi
18
19 - if [ -e ${1}/System.map-* ];
20 + if [ -e ${1}/System.map-* ]
21 then
22 - mv ${1}/System.map-* ${1}/System.map-${x}
23 + mv ${1}/System.map-* ${1}/System-${x}.map
24 fi
25 done
26 }
27 diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
28 index 55835d2..732a1f1 100755
29 --- a/targets/support/netboot2-final.sh
30 +++ b/targets/support/netboot2-final.sh
31 @@ -14,7 +14,7 @@ mkdir ${clst_target_path}kernels/misc
32 for x in ${clst_boot_kernel}; do
33 mv ${clst_target_path}boot/${x} ${clst_target_path}kernels
34 mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc
35 - mv ${clst_target_path}boot/System.map* ${clst_target_path}kernels/misc/System.map-${x}
36 + mv ${clst_target_path}boot/System-${x}.map ${clst_target_path}kernels/misc
37 done
38
39 rmdir ${clst_target_path}boot
40 --
41 1.8.3.2