From da0b760a0b27db0dfdf9a8a6c5a3c17ca7658d7c Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Fri, 14 Mar 2008 17:53:58 +0100 Subject: Fix kexec-tools on x86_64 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 Signed-off-by: Simon Horman --- purgatory/arch/x86_64/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile index 76d4d17..af25cd3 100644 --- a/purgatory/arch/x86_64/Makefile +++ b/purgatory/arch/x86_64/Makefile @@ -2,15 +2,17 @@ # 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 -- cgit