From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5E90D1380DC for ; Wed, 5 Feb 2014 10:40:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B3FCE0B2A; Wed, 5 Feb 2014 10:40:20 +0000 (UTC) Received: from venus.vo.lu (venus.vo.lu [80.90.45.96]) by pigeon.gentoo.org (Postfix) with ESMTP id AE5A4E0B2A for ; Wed, 5 Feb 2014 10:40:18 +0000 (UTC) Received: from ibiza.lux.tuxicoman.be (vodsl-8217.vo.lu [85.93.199.25]) by venus.vo.lu with SMTP (version=TLS\Tls cipher=Aes128 bits=128); Wed, 5 Feb 2014 11:39:31 +0100 Received: from terminatrix.lux.tuxicoman.be ([172.19.0.9]) by ibiza.lux.tuxicoman.be with esmtp (Exim 4.80.1) (envelope-from ) id 1WAztn-0002QU-PG for gentoo-catalyst@lists.gentoo.org; Wed, 05 Feb 2014 11:40:07 +0100 From: Guy Martin To: gentoo-catalyst@lists.gentoo.org 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, 5 Feb 2014 11:40:00 +0100 Message-Id: <1391596806-14955-6-git-send-email-gmsoft@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391596806-14955-1-git-send-email-gmsoft@gentoo.org> References: <1391596806-14955-1-git-send-email-gmsoft@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: d5174e04-65fb-4e13-9a8d-116ff4b9ee50 X-Archives-Hash: dc6b2d7a7ac3123bb4af31f145c6ee70 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 224833f..7face15 100755 --- 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 55835d2..732a1f1 100755 --- 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.3.2