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 87837138E20 for ; Wed, 19 Feb 2014 17:47:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F1A6E0B87; Wed, 19 Feb 2014 17:47:51 +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 98502E0B88 for ; Wed, 19 Feb 2014 17:47:50 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B053433F901 for ; Wed, 19 Feb 2014 17:47:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1B2D0188CA for ; Wed, 19 Feb 2014 17:47:48 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1392831122.59e71a64d4e3a75e00e10e477b251b6cbd831d81.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/functions.sh targets/support/netboot2-final.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 59e71a64d4e3a75e00e10e477b251b6cbd831d81 X-VCS-Branch: 3.0 Date: Wed, 19 Feb 2014 17:47:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bbb364de-9ba0-490f-9460-7301b8feb5e0 X-Archives-Hash: 7b2f3fe11f39d8b106097c94751fd634 commit: 59e71a64d4e3a75e00e10e477b251b6cbd831d81 Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:00 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Feb 19 17:32:02 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=59e71a64 Rename System.map in a way that it won't be matched if multiple kernel are used. 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