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 2B2A51391DB for ; Sat, 22 Mar 2014 17:04:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6690EE0C8E; Sat, 22 Mar 2014 17:03:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BCBAE0C68 for ; Sat, 22 Mar 2014 17:03:47 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id A5C9733FD28 for ; Sat, 22 Mar 2014 17:03:46 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org 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 10:03:04 -0700 Message-Id: <1395507795-13754-7-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395507795-13754-1-git-send-email-dolsen@gentoo.org> References: <1395507795-13754-1-git-send-email-dolsen@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: 984c84de-db8e-4e52-b67d-f1479df6a550 X-Archives-Hash: 4a6da15f20ee745c63079d428f467199 From: Guy Martin 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