[Xen-changelog] [xen-unstable] Using "make install" causes a distro specific script

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1190200369 -3600
# Node ID 202153d094d883be1d8567031ff1a5957a664ea7
# Parent  91a5b7eaede33414a6bade9ef50c9b2d1ffa4686
Using "make install" causes a distro specific script
(/sbin/installkernel) to be called since linux-2.6.18-xen.hg
211:c1f5d027adf7.

Unfortunately on some distros this script is broken for non-root
use. Our needs are pretty simple anyway so just open code the
installation of the kernel.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 buildconfigs/mk.linux-2.6-xen |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -r 91a5b7eaede3 -r 202153d094d8 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen     Wed Sep 19 11:58:04 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-xen     Wed Sep 19 12:12:49 2007 +0100
@@ -29,6 +29,7 @@ LINUX_DIR     = build-linux-$(LINUX_VER)
 LINUX_DIR     = build-linux-$(LINUX_VER)$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
 
 IMAGE_TARGET ?= vmlinuz
+IMAGE_PATH ?= arch/$(LINUX_ARCH)/boot/$(firstword $(IMAGE_TARGET))
 INSTALL_BOOT_PATH := $(DESTDIR)/boot
 
 LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))
@@ -62,7 +63,9 @@ endif
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) 
$(IMAGE_TARGET)
        mkdir -p $(INSTALL_BOOT_PATH)
-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) 
INSTALL_PATH=$(INSTALL_BOOT_PATH) install
+       cp $(LINUX_DIR)/$(IMAGE_PATH) 
$(INSTALL_BOOT_PATH)/vmlinuz-$(LINUX_VER)$(EXTRAVERSION)
+       cp $(LINUX_DIR)/.config 
$(INSTALL_BOOT_PATH)/config-$(LINUX_VER)$(EXTRAVERSION)
+       cp $(LINUX_DIR)/System.map 
$(INSTALL_BOOT_PATH)/System.map-$(LINUX_VER)$(EXTRAVERSION)
 
 $(LINUX_DIR)/include/linux/autoconf.h: 
CONFIG_FILE=$(CURDIR)/$(LINUX_DIR)/.config
 $(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src

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