[PATCH] x86_64 purgatory Makefile typo fix.

[PATCH] x86_64 purgatory Makefile typo fix.

[Sachin P. Sant]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

While trying to test latest kexec tools git code on a x86_64
box i ran into following issue. Kexec refused to load both
kexec and kdump kernels.

# ./build/sbin/kexec -l /boot/vmlinuz-2.6.25-rc5 --initrd=/boot/initrd-2.6.25-rc5 
Symbol: entry32_regs not found cannot get

#
# ./build/kexec -p /boot/vmlinux-kdump --initrd=/boot/initrd-kdump
 --append="...."
Symbol: entry64_regs not found cannot get

#

It turns out that entry64.S file under purgatory/arch/x86_64 was not
compiled. The original x86_64_PURGATORY_SRCS were being overwritten
in the Makefile.

Here is a patch to fix this issue. 

Thanks
-Sachin


[-- Attachment #2: kexec-tools-x86_64_purgatory_makefile_fix.patch --]
[-- Type: text/x-patch, Size: 821 bytes --]

* This patch fixes a typo in x86_64 purgatory makefile

Signed Off By : Sachin Sant (sachinp@in.ibm.com)
---


diff -Naurp old/purgatory/arch/x86_64/Makefile new/purgatory/arch/x86_64/Makefile
--- old/purgatory/arch/x86_64/Makefile	2008-03-07 11:18:10.000000000 +0530
+++ new/purgatory/arch/x86_64/Makefile	2008-03-14 14:24:50.000000000 +0530
@@ -14,7 +14,7 @@ dist += purgatory/arch/x86_64/Makefile $
 	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

[-- Attachment #3: Type: text/plain, Size: 143 bytes --]

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] x86_64 purgatory Makefile typo fix.

[Bernhard Walle]

* Sachin P. Sant [2008-03-14 10:17]:
> 
> It turns out that entry64.S file under purgatory/arch/x86_64 was not
> compiled. The original x86_64_PURGATORY_SRCS were being overwritten
> in the Makefile.
> 
> Here is a patch to fix this issue.

*arg* Didn't see that posting and fixed it myself. ;-) Anyway, you
didn't catch the missing files since you don't use the tarball, so my
work was not completely superflous.


        Bernhard



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] x86_64 purgatory Makefile typo fix.

[Simon Horman]

On Fri, Mar 14, 2008 at 02:47:00PM +0530, Sachin P. Sant wrote:
> While trying to test latest kexec tools git code on a x86_64
> box i ran into following issue. Kexec refused to load both
> kexec and kdump kernels.
>
> # ./build/sbin/kexec -l /boot/vmlinuz-2.6.25-rc5 
> --initrd=/boot/initrd-2.6.25-rc5 Symbol: entry32_regs not found cannot 
> get
>
> #
> # ./build/kexec -p /boot/vmlinux-kdump --initrd=/boot/initrd-kdump
> --append="...."
> Symbol: entry64_regs not found cannot get
>
> #
>
> It turns out that entry64.S file under purgatory/arch/x86_64 was not
> compiled. The original x86_64_PURGATORY_SRCS were being overwritten
> in the Makefile.
>
> Here is a patch to fix this issue. 

Ooops, sorry about that.

Perhaps this is worthy of a fresh release?

-- 
Horms


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] x86_64 purgatory Makefile typo fix.

[Bernhard Walle]

Hi Simon,

* Simon Horman [2008-03-17 01:49]:
> 
> Ooops, sorry about that.
> 
> Perhaps this is worthy of a fresh release?

IMO yes since the current release is unusable on x86_64. But please make
sure to also include the

 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.

part of my fix.


        Bernhard


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] x86_64 purgatory Makefile typo fix.

[Sachin P. Sant]

Simon Horman wrote:
> Ooops, sorry about that.
>
> Perhaps this is worthy of a fresh release?
>   
I think so. Current release is unusable on x86-64. Bernhard also submitted
a similar patch. You might want to club both of them together.

Thanks
-Sachin



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] x86_64 purgatory Makefile typo fix.

[Simon Horman]

On Mon, Mar 17, 2008 at 10:07:36AM +0100, Bernhard Walle wrote:
> Hi Simon,
> 
> * Simon Horman [2008-03-17 01:49]:
> > 
> > Ooops, sorry about that.
> > 
> > Perhaps this is worthy of a fresh release?
> 
> IMO yes since the current release is unusable on x86_64. But please make
> sure to also include the
> 
>  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.
> 
> part of my fix.

Thanks, I wasn't aware that was how make variables work.
I've merged your change.

-- 
Horms


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec