From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-685639-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 275B41393EA
for <garchives@archives.gentoo.org>; Mon, 14 Apr 2014 01:16:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 093CFE0ABD;
Mon, 14 Apr 2014 01:16:14 +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 69EB5E0AB5
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Apr 2014 01:16:13 +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 5EBB133FFD7
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Apr 2014 01:16:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id E25C31818D
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Apr 2014 01:16:10 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1397436876.dfbf55f690e21637786023777a216c6a6040dcac.robbat2@gentoo>
Subject: [gentoo-commits] proj/genkernel:master commit in: /
X-VCS-Repository: proj/genkernel
X-VCS-Files: gen_compile.sh
X-VCS-Directories: /
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: dfbf55f690e21637786023777a216c6a6040dcac
X-VCS-Branch: master
Date: Mon, 14 Apr 2014 01:16:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7b201803-c5fa-4bc4-b5db-28462d3e5355
X-Archives-Hash: f1303c5972689f5abbe8b68d8f988dcd
commit: dfbf55f690e21637786023777a216c6a6040dcac
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 00:54:36 2014 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 00:54:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=dfbf55f6
Fix System.map location for src!=output dir.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
---
gen_compile.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gen_compile.sh b/gen_compile.sh
index f10aa04..a90977f 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -345,6 +345,7 @@ compile_kernel() {
# if source != outputdir, we need this:
tmp_kernel_binary="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary}"
tmp_kernel_binary2="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary2}"
+ systemmap="${KERNEL_OUTPUTDIR}"/System.map
if isTrue "${CMD_INSTALL}"
then
@@ -353,7 +354,7 @@ compile_kernel() {
"kernel-${KNAME}-${ARCH}-${KV}"
copy_image_with_preserve "System.map" \
- "System.map" \
+ "${systemmap}" \
"System.map-${KNAME}-${ARCH}-${KV}"
if isTrue "${GENZIMAGE}"
@@ -365,7 +366,7 @@ compile_kernel() {
else
cp "${tmp_kernel_binary}" "${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}" ||
gen_die "Could not copy the kernel binary to ${TMPDIR}!"
- cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
+ cp "${systemmap}" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
gen_die "Could not copy System.map to ${TMPDIR}!"
if isTrue "${GENZIMAGE}"
then