From: Bernhard Walle <bwalle@suse.de>
To: kexec@lists.infradead.org
Subject: [PATCH] Fix kexec-tools on x86_64
Date: Fri, 14 Mar 2008 17:53:58 +0100 [thread overview]
Message-ID: <20080314165358.GA10674@suse.de> (raw)
This patch fixes kexec-tools on x86_64. The build had two problems:
1. The distribution missed the files
purgatory/arch/x86_64/entry64-32.S,
purgatory/arch/x86_64/entry64.S,
purgatory/arch/x86_64/setup-x86_64.S,
purgatory/arch/x86_64/stack.S,
purgatory/arch/x86_64/purgatory-x86_64.c
The problem was that variable expansion in a Makefile is a bit different
from the expectation, i.e. the final value is used even if the variable is
used in the middle.
2. The build didn't include the files mentioned above. This was because of
using '=' instead of '+=' in the 2nd part of the Makefile.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
---
purgatory/arch/x86_64/Makefile | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile
index 01fbbf3..af25cd3 100644
--- a/purgatory/arch/x86_64/Makefile
+++ b/purgatory/arch/x86_64/Makefile
@@ -2,19 +2,21 @@
# Purgatory x86_64
#
-x86_64_PURGATORY_SRCS += purgatory/arch/x86_64/entry64-32.S
-x86_64_PURGATORY_SRCS += purgatory/arch/x86_64/entry64.S
-x86_64_PURGATORY_SRCS += purgatory/arch/x86_64/setup-x86_64.S
-x86_64_PURGATORY_SRCS += purgatory/arch/x86_64/stack.S
-x86_64_PURGATORY_SRCS += purgatory/arch/x86_64/purgatory-x86_64.c
+x86_64_PURGATORY_SRCS_native = purgatory/arch/x86_64/entry64-32.S
+x86_64_PURGATORY_SRCS_native += purgatory/arch/x86_64/entry64.S
+x86_64_PURGATORY_SRCS_native += purgatory/arch/x86_64/setup-x86_64.S
+x86_64_PURGATORY_SRCS_native += purgatory/arch/x86_64/stack.S
+x86_64_PURGATORY_SRCS_native += purgatory/arch/x86_64/purgatory-x86_64.c
-dist += purgatory/arch/x86_64/Makefile $(x86_64_PURGATORY_SRCS) \
- purgatory/arch/x86_64/include/arch/io.h \
- purgatory/arch/x86_64/include/arch/debug.h \
+x86_64_PURGATORY_SRCS += $(x86_64_PURGATORY_SRCS_native)
+
+dist += purgatory/arch/x86_64/Makefile $(x86_64_PURGATORY_SRCS_native) \
+ purgatory/arch/x86_64/include/arch/io.h \
+ purgatory/arch/x86_64/include/arch/debug.h \
purgatory/arch/x86_64/purgatory-x86_64.h
# Done add sources in i386/ to dist, as i386/Makefile adds them
-x86_64_PURGATORY_SRCS = purgatory/arch/i386/entry32-16.S
+x86_64_PURGATORY_SRCS += purgatory/arch/i386/entry32-16.S
x86_64_PURGATORY_SRCS += purgatory/arch/i386/entry32-16-debug.S
x86_64_PURGATORY_SRCS += purgatory/arch/i386/crashdump_backup.c
x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c
--
1.5.3.8
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
reply other threads:[~2008-03-14 16:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080314165358.GA10674@suse.de \
--to=bwalle@suse.de \
--cc=kexec@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox