ia64/xen-unstable

changeset 5107:b5b5a5e4052c

bitkeeper revision 1.1519.1.1 (42926ccbNcRLyOP3D-TWC04yWeeZkA)

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-clean
author cl349@firebug.cl.cam.ac.uk
date Mon May 23 23:52:43 2005 +0000 (2005-05-23)
parents 18001959ba29 4ac062bc252d
children cff6a5c4f4b6
files .hgtags 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
line diff
     1.1 --- a/.hgtags	Mon May 23 22:34:38 2005 +0000
     1.2 +++ b/.hgtags	Mon May 23 23:52:43 2005 +0000
     1.3 @@ -4,7 +4,7 @@ dc2f08429f17e6614fd2f1ab88cc09ca0a850f32
     1.4  6e1bbc13911751efa0b1c018425c1b085820fa02 RELEASE-2.0.3
     1.5  fb875591fd72e15c31879c0e9034d99b80225595 RELEASE-2.0.4
     1.6  1a522944f76540ea9d73fcc1b0d13d0f670183f0 RELEASE-2.0.5
     1.7 -543ffea3fc12a8e7dce6e7e4ece21eee8e7ac4c6 RELEASE-2.0.6
     1.8 +2a5814ad2e5634a5fa291b703a152e7fc0b4faf0 RELEASE-2.0.6
     1.9  487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1
    1.10  1f84d0497a5901b9f8d1a051b87871d140b7e23f ia64-stable
    1.11  3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable
     2.1 --- a/buildconfigs/mk.linux-2.4-xen0	Mon May 23 22:34:38 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Mon May 23 23:52:43 2005 +0000
     2.3 @@ -30,18 +30,18 @@ patches/tmp/ebtables.diff:
     2.4  	# Apply arch-xen patches
     2.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     2.6            ./mkbuildtree ../$(LINUX_DIR) )
     2.7 +	# add ebtables patch
     2.8 +	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
     2.9 +	# Re-use config from install dir if one exits else use default config
    2.10 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    2.11 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    2.12 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    2.13 +	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    2.14 +		$(LINUX_DIR)/.config
    2.15  	# Patch kernel Makefile to set EXTRAVERSION
    2.16  	( cd $(LINUX_DIR) ; \
    2.17  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    2.18  	  rm -f Makefile ; mv Mk.tmp Makefile )
    2.19 -	# add ebtables patch
    2.20 -	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
    2.21 -	# Re-use config from install dir if one exits else use default config
    2.22 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    2.23 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    2.24 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    2.25 -	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    2.26 -		$(LINUX_DIR)/.config
    2.27  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    2.28  	make -C $(LINUX_DIR) ARCH=xen dep
    2.29  
     3.1 --- a/buildconfigs/mk.linux-2.4-xenU	Mon May 23 22:34:38 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Mon May 23 23:52:43 2005 +0000
     3.3 @@ -25,16 +25,16 @@ build: $(LINUX_DIR)/include/linux/autoco
     3.4  	# Apply arch-xen patches
     3.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     3.6            ./mkbuildtree ../$(LINUX_DIR) )
     3.7 +	# Re-use config from install dir if one exits else use default config
     3.8 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     3.9 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    3.10 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    3.11 +	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    3.12 +		$(LINUX_DIR)/.config
    3.13  	# Patch kernel Makefile to set EXTRAVERSION
    3.14  	( cd $(LINUX_DIR) ; \
    3.15  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    3.16  	  rm -f Makefile ; mv Mk.tmp Makefile )
    3.17 -	# Re-use config from install dir if one exits else use default config
    3.18 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    3.19 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    3.20 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    3.21 -	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    3.22 -		$(LINUX_DIR)/.config
    3.23  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    3.24  	make -C $(LINUX_DIR) ARCH=xen dep
    3.25  
     4.1 --- a/buildconfigs/mk.linux-2.6-xen0	Mon May 23 22:34:38 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Mon May 23 23:52:43 2005 +0000
     4.3 @@ -25,16 +25,16 @@ build: $(LINUX_DIR)/include/linux/autoco
     4.4  	# Apply arch-xen patches
     4.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     4.6            ./mkbuildtree ../$(LINUX_DIR) )
     4.7 +	# Re-use config from install dir if one exits else use default config
     4.8 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     4.9 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    4.10 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    4.11 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
    4.12 +		$(LINUX_DIR)/.config
    4.13  	# Patch kernel Makefile to set EXTRAVERSION
    4.14  	( cd $(LINUX_DIR) ; \
    4.15  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    4.16  	  rm -f Makefile ; mv Mk.tmp Makefile )
    4.17 -	# Re-use config from install dir if one exits else use default config
    4.18 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    4.19 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    4.20 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    4.21 -	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
    4.22 -		$(LINUX_DIR)/.config
    4.23  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    4.24  
    4.25  config: CONFIGMODE = menuconfig
     5.1 --- a/buildconfigs/mk.linux-2.6-xenU	Mon May 23 22:34:38 2005 +0000
     5.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Mon May 23 23:52:43 2005 +0000
     5.3 @@ -25,16 +25,16 @@ build: $(LINUX_DIR)/include/linux/autoco
     5.4  	# Apply arch-xen patches
     5.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     5.6            ./mkbuildtree ../$(LINUX_DIR) )
     5.7 +	# Re-use config from install dir if one exits else use default config
     5.8 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     5.9 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    5.10 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    5.11 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
    5.12 +		$(LINUX_DIR)/.config
    5.13  	# Patch kernel Makefile to set EXTRAVERSION
    5.14  	( cd $(LINUX_DIR) ; \
    5.15  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    5.16  	  rm -f Makefile ; mv Mk.tmp Makefile )
    5.17 -	# Re-use config from install dir if one exits else use default config
    5.18 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    5.19 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    5.20 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    5.21 -	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
    5.22 -		$(LINUX_DIR)/.config
    5.23  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    5.24  
    5.25  config: CONFIGMODE = menuconfig
     6.1 --- a/install.sh	Mon May 23 22:34:38 2005 +0000
     6.2 +++ b/install.sh	Mon May 23 23:52:43 2005 +0000
     6.3 @@ -23,7 +23,8 @@ if ! [ -d $dst ]; then
     6.4  fi
     6.5  
     6.6  echo "Installing Xen from '$src' to '$dst'..."
     6.7 -cp -fdRL $src/* $dst
     6.8 +(cd $src; tar -cf - --exclude etc/init.d * ) | tar -C $dst -xf -
     6.9 +cp -fdRL $src/etc/init.d/* $dst/etc/init.d/
    6.10  echo "All done."
    6.11  
    6.12  echo "Checking to see whether prerequisite tools are installed..."