[Xen-changelog] Other than the native kernels, the xen guests install without attempting

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 374ff557a88fc0e7a4991dec4f36db31adf5ad2f
# Parent  4b06e1c365fc1fa9f20a27acb23f5dcc7fe2a8d0

Other than the native kernels, the xen guests install without attempting
to use distribution provided mechanisms, thus e.g. preventing the
auto-generation of an initrd. Below/attached a suggestion to adjust that.
Signed-off-by: Jan Beulich <JBeulich@xxxxxxxxxx>

diff -r 4b06e1c365fc -r 374ff557a88f linux-2.6.11-xen-sparse/arch/xen/Makefile
--- a/linux-2.6.11-xen-sparse/arch/xen/Makefile Fri Jul  1 15:47:46 2005
+++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile Fri Jul  1 15:48:47 2005
@@ -63,8 +63,13 @@
 vmlinuz: vmlinux
        $(Q)$(MAKE) $(build)=arch/xen/boot vmlinuz
 
+ifeq ($(INSTALL_PATH),)
+install.sh := $(shell find $(srctree)/arch/$(XENARCH) -name install.sh)
+endif
+
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install: vmlinuz
+ifeq ($(install.sh),)
        mkdir -p $(INSTALL_PATH)/boot
        ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) 
$(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
@@ -75,6 +80,9 @@
        ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) 
$(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
        install -m0644 $(srctree)/include/asm-xen/linux-public/*.h 
$(INSTALL_PATH)/usr/include/xen/linux
+else
+       sh $(install.sh) $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
+endif
 
 archclean:
        @if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;

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