ia64/xen-unstable

changeset 4918:b811d111b152

bitkeeper revision 1.1409 (4285cffel2cHlgTVve7rKm7P52VnFw)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
author cl349@firebug.cl.cam.ac.uk
date Sat May 14 10:16:30 2005 +0000 (2005-05-14)
parents 0651c17c1f17 b3e15fadc1c1
children 64f9e006da57
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 linux-2.4.29-xen-sparse/arch/xen/Makefile linux-2.6.11-xen-sparse/arch/xen/Makefile
line diff
     1.1 --- a/buildconfigs/mk.linux-2.4-xen0	Sat May 14 00:21:03 2005 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Sat May 14 10:16:30 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.*/&-$$(XENGUEST)\nXENGUEST = $(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	Sat May 14 00:21:03 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Sat May 14 10:16:30 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.*/&-$$(XENGUEST)\nXENGUEST = $(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	Sat May 14 00:21:03 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Sat May 14 10:16:30 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.*/&-$$(XENGUEST)\nXENGUEST = $(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	Sat May 14 00:21:03 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Sat May 14 10:16:30 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.*/&-$$(XENGUEST)\nXENGUEST = $(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/linux-2.4.29-xen-sparse/arch/xen/Makefile	Sat May 14 00:21:03 2005 +0000
     5.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile	Sat May 14 10:16:30 2005 +0000
     5.3 @@ -115,13 +115,13 @@ bzImage: vmlinux
     5.4  INSTALL_NAME ?= $(KERNELRELEASE)
     5.5  install: bzImage
     5.6  	mkdir -p $(INSTALL_PATH)/boot
     5.7 -	ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
     5.8 +	ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
     5.9  	rm -f $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    5.10  	install -m0644 arch/$(ARCH)/boot/bzImage $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    5.11  	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    5.12  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    5.13  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    5.14 -	ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
    5.15 +	ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
    5.16  
    5.17  %_config: arch/xen/defconfig-%
    5.18  	rm -f .config arch/xen/defconfig
     6.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Makefile	Sat May 14 00:21:03 2005 +0000
     6.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile	Sat May 14 10:16:30 2005 +0000
     6.3 @@ -48,13 +48,13 @@ vmlinuz: vmlinux
     6.4  XINSTALL_NAME ?= $(KERNELRELEASE)
     6.5  install: vmlinuz
     6.6  	mkdir -p $(INSTALL_PATH)/boot
     6.7 -	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
     6.8 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
     6.9  	rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    6.10  	install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    6.11  	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    6.12  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    6.13  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    6.14 -	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
    6.15 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
    6.16  	mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
    6.17  	install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
    6.18