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

Reply via email to