ia64/xen-unstable

changeset 4916:0651c17c1f17

bitkeeper revision 1.1408 (4285446fFFH8-wyJ168gdNkCDjEaNQ)

Merge 2.0-testing changes:
- Install xen binary with version number appended and create several symlinks
for less specific version numbers.
- Change XEN_EXTRAVERSION to -testing, move surrounding-" to compile.h.in.
Also define XEN_FULLVESION and use.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Sat May 14 00:21:03 2005 +0000 (2005-05-14)
parents 5020295d041d a1d83e29ee2d
children b811d111b152
files buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU install.sh linux-2.4.29-xen-sparse/arch/xen/Makefile linux-2.6.11-xen-sparse/arch/xen/Makefile xen/Makefile xen/include/xen/compile.h.in
line diff
     1.1 --- a/buildconfigs/mk.linux-2.4-xen0	Fri May 13 21:21:38 2005 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Sat May 14 00:21:03 2005 +0000
     1.3 @@ -32,7 +32,7 @@ patches/tmp/ebtables.diff:
     1.4            ./mkbuildtree ../$(LINUX_DIR) )
     1.5  	# Patch kernel Makefile to set EXTRAVERSION
     1.6  	( cd $(LINUX_DIR) ; \
     1.7 -	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     1.8 +	  sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     1.9  	  rm -f Makefile ; mv Mk.tmp Makefile )
    1.10  	# add ebtables patch
    1.11  	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
     2.1 --- a/buildconfigs/mk.linux-2.4-xenU	Fri May 13 21:21:38 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Sat May 14 00:21:03 2005 +0000
     2.3 @@ -27,7 +27,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     2.4            ./mkbuildtree ../$(LINUX_DIR) )
     2.5  	# Patch kernel Makefile to set EXTRAVERSION
     2.6  	( cd $(LINUX_DIR) ; \
     2.7 -	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     2.8 +	  sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     2.9  	  rm -f Makefile ; mv Mk.tmp Makefile )
    2.10  	# Re-use config from install dir if one exits else use default config
    2.11  	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     3.1 --- a/buildconfigs/mk.linux-2.6-xen0	Fri May 13 21:21:38 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Sat May 14 00:21:03 2005 +0000
     3.3 @@ -27,7 +27,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     3.4            ./mkbuildtree ../$(LINUX_DIR) )
     3.5  	# Patch kernel Makefile to set EXTRAVERSION
     3.6  	( cd $(LINUX_DIR) ; \
     3.7 -	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     3.8 +	  sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     3.9  	  rm -f Makefile ; mv Mk.tmp Makefile )
    3.10  	# Re-use config from install dir if one exits else use default config
    3.11  	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     4.1 --- a/buildconfigs/mk.linux-2.6-xenU	Fri May 13 21:21:38 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Sat May 14 00:21:03 2005 +0000
     4.3 @@ -27,7 +27,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     4.4            ./mkbuildtree ../$(LINUX_DIR) )
     4.5  	# Patch kernel Makefile to set EXTRAVERSION
     4.6  	( cd $(LINUX_DIR) ; \
     4.7 -	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     4.8 +	  sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     4.9  	  rm -f Makefile ; mv Mk.tmp Makefile )
    4.10  	# Re-use config from install dir if one exits else use default config
    4.11  	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     5.1 --- a/install.sh	Fri May 13 21:21:38 2005 +0000
     5.2 +++ b/install.sh	Sat May 14 00:21:03 2005 +0000
     5.3 @@ -23,15 +23,6 @@ if ! [ -d $dst ]; then
     5.4  fi
     5.5  
     5.6  echo "Installing Xen from '$src' to '$dst'..."
     5.7 -cd $src/boot
     5.8 -(echo '2.6.*' -2.6; echo '2.4.*' -2.4; echo '2.*.*' '') | while read m v
     5.9 -do
    5.10 -  l=$(eval ls -t vmlinuz-$m-xen0 2>/dev/null | head -n 1)
    5.11 -  [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xen0
    5.12 -  l=$(eval ls -t vmlinuz-$m-xenU 2>/dev/null | head -n 1)
    5.13 -  [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xenU
    5.14 -done
    5.15 -cd -
    5.16  cp -fdRL $src/* $dst
    5.17  echo "All done."
    5.18  
     6.1 --- a/linux-2.4.29-xen-sparse/arch/xen/Makefile	Fri May 13 21:21:38 2005 +0000
     6.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile	Sat May 14 00:21:03 2005 +0000
     6.3 @@ -115,10 +115,13 @@ bzImage: vmlinux
     6.4  INSTALL_NAME ?= $(KERNELRELEASE)
     6.5  install: bzImage
     6.6  	mkdir -p $(INSTALL_PATH)/boot
     6.7 +	ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
     6.8 +	rm -f $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     6.9  	install -m0644 arch/$(ARCH)/boot/bzImage $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    6.10  	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    6.11  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    6.12  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    6.13 +	ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
    6.14  
    6.15  %_config: arch/xen/defconfig-%
    6.16  	rm -f .config arch/xen/defconfig
     7.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Makefile	Fri May 13 21:21:38 2005 +0000
     7.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile	Sat May 14 00:21:03 2005 +0000
     7.3 @@ -48,10 +48,13 @@ vmlinuz: vmlinux
     7.4  XINSTALL_NAME ?= $(KERNELRELEASE)
     7.5  install: vmlinuz
     7.6  	mkdir -p $(INSTALL_PATH)/boot
     7.7 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
     7.8 +	rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     7.9  	install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    7.10  	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    7.11  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    7.12  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    7.13 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
    7.14  	mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
    7.15  	install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
    7.16  
     8.1 --- a/xen/Makefile	Fri May 13 21:21:38 2005 +0000
     8.2 +++ b/xen/Makefile	Sat May 14 00:21:03 2005 +0000
     8.3 @@ -10,7 +10,8 @@ INSTALL_DIR		= $(INSTALL) -d -m0755
     8.4  # All other places this is stored (eg. compile.h) should be autogenerated.
     8.5  export XEN_VERSION       = 3
     8.6  export XEN_SUBVERSION    = 0
     8.7 -export XEN_EXTRAVERSION  = "-devel"
     8.8 +export XEN_EXTRAVERSION  = -devel
     8.9 +export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
    8.10  
    8.11  export BASEDIR          := $(CURDIR)
    8.12  
    8.13 @@ -30,8 +31,11 @@ build: $(TARGET).gz
    8.14  
    8.15  install: $(TARGET).gz
    8.16  	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
    8.17 -	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot
    8.18 -	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot
    8.19 +	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz
    8.20 +	ln -f -s $(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz
    8.21 +	ln -f -s $(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz
    8.22 +	ln -f -s $(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz
    8.23 +	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)-syms
    8.24  	[ -d $(DESTDIR)/usr/include/xen/io ] || \
    8.25  		$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
    8.26  	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen
    8.27 @@ -84,7 +88,7 @@ tools/figlet/figlet.o: tools/figlet/figl
    8.28  	$(HOSTCC) -o $@ -c $<
    8.29  
    8.30  include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
    8.31 -	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
    8.32 +	tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) > $@.new
    8.33  	@mv -f $@.new $@
    8.34  
    8.35  include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
     9.1 --- a/xen/include/xen/compile.h.in	Fri May 13 21:21:38 2005 +0000
     9.2 +++ b/xen/include/xen/compile.h.in	Sat May 14 00:21:03 2005 +0000
     9.3 @@ -7,7 +7,7 @@
     9.4  
     9.5  #define XEN_VERSION		@@version@@
     9.6  #define XEN_SUBVERSION		@@subversion@@
     9.7 -#define XEN_EXTRAVERSION	@@extraversion@@
     9.8 +#define XEN_EXTRAVERSION	"@@extraversion@@"
     9.9  
    9.10  #define XEN_CHANGESET		"@@changeset@@"
    9.11  #define XEN_BANNER		\