[Xen-changelog] [xen-unstable] Fix dist target to keep previous symlink format.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Steven Hand <steven@xxxxxxxxxxxxx>
# Date 1177079351 -3600
# Node ID 6568c1882af50d0cec7b0aa950926c282df2915f
# Parent  efdbf87d4741c0b19690cbfea234e12764347fea
Fix dist target to keep previous symlink format.
May be a cleaner fix which I'll let IanC do.

Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/i386/Makefile          |    2 +-
 linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile |    4 +---
 linux-2.6-xen-sparse/arch/x86_64/Makefile        |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff -r efdbf87d4741 -r 6568c1882af5 linux-2.6-xen-sparse/arch/i386/Makefile
--- a/linux-2.6-xen-sparse/arch/i386/Makefile   Fri Apr 20 14:04:32 2007 +0100
+++ b/linux-2.6-xen-sparse/arch/i386/Makefile   Fri Apr 20 15:29:11 2007 +0100
@@ -125,7 +125,7 @@ vmlinuz: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
 install:
-       $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
+       $(Q)$(MAKE) $(build)=$(boot) $@
 else
 all: bzImage
 
diff -r efdbf87d4741 -r 6568c1882af5 
linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile
--- a/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile  Fri Apr 20 14:04:32 
2007 +0100
+++ b/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile  Fri Apr 20 15:29:11 
2007 +0100
@@ -12,10 +12,8 @@ XINSTALL_NAME ?= $(KERNELRELEASE)
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install:
        mkdir -p $(INSTALL_ROOT)/boot
-       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) 
$(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-       rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinuz 
$(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinux 
$(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 .config 
$(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 System.map 
$(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) 
$(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) 
$(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(shell cat 
./localversion-xen)$(INSTALL_SUFFIX)
diff -r efdbf87d4741 -r 6568c1882af5 linux-2.6-xen-sparse/arch/x86_64/Makefile
--- a/linux-2.6-xen-sparse/arch/x86_64/Makefile Fri Apr 20 14:04:32 2007 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/Makefile Fri Apr 20 15:29:11 2007 +0100
@@ -91,7 +91,7 @@ vmlinuz: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
 install:
-       $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
+       $(Q)$(MAKE) $(build)=$(boot) $@
 else
 #Default target when executing "make"
 all: bzImage

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog