Gentoo Archives: gentoo-catalyst

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