[PATCH] Re: [Xen-staging] [xen-unstable] Using "make install" causes a distro specific script

[PATCH] Re: [Xen-staging] [xen-unstable] Using "make install" causes a distro specific script

[Alex Williamson]

On Wed, 2007-09-19 at 12:14 +0100, Xen staging patchbot-unstable wrote:
> # HG changeset patch
> # User Ian Campbell 
> # 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.

   Using the distro install script protected us from needing to worry
about the differences between architectures.  Going down this route, we
need the patch below to get the image from the right place on ia64.
Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 202153d094d8 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen	Wed Sep 19 12:12:49 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-xen	Wed Sep 19 07:40:35 2007 -0600
@@ -29,7 +29,11 @@ LINUX_DIR     = build-linux-$(LINUX_VER)
 LINUX_DIR     = build-linux-$(LINUX_VER)$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
 
 IMAGE_TARGET ?= vmlinuz
+ifneq ($(XEN_TARGET_ARCH),ia64)
 IMAGE_PATH ?= arch/$(LINUX_ARCH)/boot/$(firstword $(IMAGE_TARGET))
+else
+IMAGE_PATH ?= arch/ia64/hp/sim/boot/vmlinux.gz
+endif
 INSTALL_BOOT_PATH := $(DESTDIR)/boot
 
 LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))

Re: [PATCH] Re: [Xen-staging] [xen-unstable] Using "make install" causes a distro specific script

[Ian Campbell]

On Wed, 2007-09-19 at 07:46 -0600, Alex Williamson wrote:
> On Wed, 2007-09-19 at 12:14 +0100, Xen staging patchbot-unstable wrote:
> > # HG changeset patch
> > # User Ian Campbell 
> > # 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.
> 
>    Using the distro install script protected us from needing to worry
> about the differences between architectures.  Going down this route, we
> need the patch below to get the image from the right place on ia64.
> Thanks,

Sorry about that. I'm not terribly happy with not using the install
target but we couldn't think of another satisfactory way to avoid the
broken behaviour on Debian (fixed in unstable in a matter of minutes by
a very responsive maintainer, but we still need to support stable I
think).

I've CC'd xen-ppc-devel for the powerpc path, then I'll commit.

> 
> 	Alex
> 
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>
> ---
> 
> diff -r 202153d094d8 buildconfigs/mk.linux-2.6-xen
> --- a/buildconfigs/mk.linux-2.6-xen	Wed Sep 19 12:12:49 2007 +0100
> +++ b/buildconfigs/mk.linux-2.6-xen	Wed Sep 19 07:40:35 2007 -0600
> @@ -29,7 +29,11 @@ LINUX_DIR     = build-linux-$(LINUX_VER)
>  LINUX_DIR     = build-linux-$(LINUX_VER)$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
>  
>  IMAGE_TARGET ?= vmlinuz
> +ifneq ($(XEN_TARGET_ARCH),ia64)
>  IMAGE_PATH ?= arch/$(LINUX_ARCH)/boot/$(firstword $(IMAGE_TARGET))
> +else
> +IMAGE_PATH ?= arch/ia64/hp/sim/boot/vmlinux.gz
> +endif
>  INSTALL_BOOT_PATH := $(DESTDIR)/boot
>  
>  LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))
> 
>