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 4F391138CD0 for ; Thu, 21 May 2015 23:53:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54484E08C8; Thu, 21 May 2015 23:53:35 +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 61A30E08EA for ; Thu, 21 May 2015 23:53:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCA50340FEF for ; Thu, 21 May 2015 23:53:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86BD49FE for ; Thu, 21 May 2015 23:53:30 +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: <1425002584.d8549032b9081e86465ce3d1f219d5e1043858f1.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d8549032b9081e86465ce3d1f219d5e1043858f1 X-VCS-Branch: pending Date: Thu, 21 May 2015 23:53:30 +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: 2af7a631-e3e2-43c4-b88b-96351bc64637 X-Archives-Hash: d811948a4b2a273e29789d5e17cb2e7b commit: d8549032b9081e86465ce3d1f219d5e1043858f1 Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:00 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Feb 27 02:03:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d8549032 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 9419b2b..de37c19 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -107,9 +107,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 } 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 0A9C1138CCF for ; Sun, 24 May 2015 00:08:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B047E091A; Sun, 24 May 2015 00:08:35 +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 EBE48E091E for ; Sun, 24 May 2015 00:08:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4DC3F3409D2 for ; Sun, 24 May 2015 00:08:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB6F2A04 for ; Sun, 24 May 2015 00:08:30 +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: <1425002584.d8549032b9081e86465ce3d1f219d5e1043858f1.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d8549032b9081e86465ce3d1f219d5e1043858f1 X-VCS-Branch: master Date: Sun, 24 May 2015 00:08:30 +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: 37f8de50-01dd-49e6-8b13-db7776ac63ad X-Archives-Hash: 2b96bacf0dfc161092313cbbb73447fe Message-ID: <20150524000830.CCloy_meoS-ghvazzLi-wcLmlUJWek5cmFcBIp96f6c@z> commit: d8549032b9081e86465ce3d1f219d5e1043858f1 Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:00 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Feb 27 02:03:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d8549032 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 9419b2b..de37c19 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -107,9 +107,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 }