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 69184138A1F for ; Fri, 18 Apr 2014 16:52:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46B91E0AC3; Fri, 18 Apr 2014 16:52:30 +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 CD90FE0AFC for ; Fri, 18 Apr 2014 16:52:28 +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 01EE4340393 for ; Fri, 18 Apr 2014 16:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3C638182D0 for ; Fri, 18 Apr 2014 16:52:25 +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: <1397839836.11eb8988841a3ac755099159ea949d33cb63c3fe.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: 11eb8988841a3ac755099159ea949d33cb63c3fe X-VCS-Branch: 3.0 Date: Fri, 18 Apr 2014 16:52:25 +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: c93f75b9-212a-4753-95da-631c57f557d9 X-Archives-Hash: 08832c80cbdfea392d4a28654e6692b9 commit: 11eb8988841a3ac755099159ea949d33cb63c3fe Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:00 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Apr 18 16:50:36 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=11eb8988 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