ia64/xen-unstable

changeset 4871:33066831d434

bitkeeper revision 1.1159.258.115 (428354804NJckGgn06IblzmoXJ6F4A)

Many files:
Add additional intermediate tree (e.g. ref-linux-2.6.11) which is a pristine
tree with the patches from patches/$(OS)-$(OS_VER) applied. The pristine tree
is really pristine now. Also add dependency of ref-$(OS)-$(OS_VER) tree on
patches in patches/$(OS)-$(OS_VER).
ignore:
Add ref-*
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu May 12 13:05:04 2005 +0000 (2005-05-12)
parents b84525ccb0c9
children e9ca570f9023 caa382d9c347
files BitKeeper/etc/ignore buildconfigs/Rules.mk buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU buildconfigs/mk.netbsd-2.0-xenU
line diff
     1.1 --- a/BitKeeper/etc/ignore	Sun May 08 08:37:12 2005 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Thu May 12 13:05:04 2005 +0000
     1.3 @@ -54,6 +54,7 @@ netbsd-*-xenU/*
     1.4  netbsd-*.patch
     1.5  patches/tmp/*
     1.6  pristine-*
     1.7 +ref-*
     1.8  tools/*/build/lib*/*.py
     1.9  tools/balloon/balloon
    1.10  tools/check/.*
     2.1 --- a/buildconfigs/Rules.mk	Sun May 08 08:37:12 2005 +0000
     2.2 +++ b/buildconfigs/Rules.mk	Thu May 12 13:05:04 2005 +0000
     2.3 @@ -41,6 +41,12 @@ netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).ta
     2.4  netbsd-%.tar.bz2: netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
     2.5  	ln -fs $< $@
     2.6  
     2.7 +ifeq ($(OS),linux)
     2.8 +OS_VER = $(LINUX_VER)
     2.9 +else
    2.10 +OS_VER = $(NETBSD_VER)
    2.11 +endif
    2.12 +
    2.13  pristine-%: %.tar.bz2
    2.14  	rm -rf tmp-$(@F) $@
    2.15  	mkdir -p tmp-$(@F)
    2.16 @@ -48,9 +54,17 @@ pristine-%: %.tar.bz2
    2.17  	mv tmp-$(@F)/* $@
    2.18  	touch $@ # update timestamp to avoid rebuild
    2.19  	@rm -rf tmp-$(@F)
    2.20 +
    2.21 +OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch)
    2.22 +
    2.23 +ref-%: pristine-% $(OS_PATCHES)
    2.24 +	rm -rf $@
    2.25 +	cp -al $< tmp-$(@F)
    2.26  	[ -d patches/$* ] && \
    2.27 -	  for i in patches/$*/*.patch ; do ( cd $@ ; patch -p1 <../$$i ) ; done || \
    2.28 +	  for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) ; done || \
    2.29  	  true
    2.30 +	mv tmp-$(@F) $@
    2.31 +	touch $@ # update timestamp to avoid rebuild
    2.32  
    2.33  %-build:
    2.34  	$(MAKE) -f buildconfigs/mk.$* build
    2.35 @@ -61,7 +75,7 @@ pristine-%: %.tar.bz2
    2.36  %-clean:
    2.37  	$(MAKE) -f buildconfigs/mk.$* clean
    2.38  
    2.39 -%-xen.patch: pristine-%
    2.40 +%-xen.patch: ref-%
    2.41  	rm -rf tmp-$@
    2.42  	cp -al $< tmp-$@
    2.43  	( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )	
    2.44 @@ -69,7 +83,7 @@ pristine-%: %.tar.bz2
    2.45  	rm -rf tmp-$@
    2.46  
    2.47  %-mrproper: %-mrproper-extra
    2.48 -	rm -rf pristine-$* $*.tar.bz2
    2.49 +	rm -rf pristine-$* ref-$* $*.tar.bz2
    2.50  	rm -rf $*-xen.patch
    2.51  
    2.52  netbsd-%-mrproper-extra:
     3.1 --- a/buildconfigs/mk.linux-2.4-xen0	Sun May 08 08:37:12 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Thu May 12 13:05:04 2005 +0000
     3.3 @@ -1,3 +1,5 @@
     3.4 +
     3.5 +OS           = linux
     3.6  
     3.7  LINUX_SERIES = 2.4
     3.8  
     3.9 @@ -5,7 +7,7 @@ EXTRAVERSION = xen0
    3.10  
    3.11  FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
    3.12  
    3.13 -LINUX_DIR    = linux-$(FULLVERSION)
    3.14 +LINUX_DIR    = $(OS)-$(FULLVERSION)
    3.15  
    3.16  include buildconfigs/Rules.mk
    3.17  
    3.18 @@ -24,7 +26,7 @@ patches/tmp/ebtables.diff:
    3.19  	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
    3.20  
    3.21  $(LINUX_DIR)/include/linux/autoconf.h: patches/tmp/ebtables.diff
    3.22 -$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    3.23 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
    3.24  	rm -rf $(LINUX_DIR)
    3.25  	cp -al $< $(LINUX_DIR)
    3.26  	# Apply arch-xen patches
    3.27 @@ -48,4 +50,4 @@ clean:
    3.28  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    3.29  
    3.30  delete: 
    3.31 -	rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
    3.32 +	rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
     4.1 --- a/buildconfigs/mk.linux-2.4-xenU	Sun May 08 08:37:12 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Thu May 12 13:05:04 2005 +0000
     4.3 @@ -1,3 +1,5 @@
     4.4 +
     4.5 +OS           = linux
     4.6  
     4.7  LINUX_SERIES = 2.4
     4.8  
     4.9 @@ -5,7 +7,7 @@ EXTRAVERSION = xenU
    4.10  
    4.11  FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
    4.12  
    4.13 -LINUX_DIR    = linux-$(FULLVERSION)
    4.14 +LINUX_DIR    = $(OS)-$(FULLVERSION)
    4.15  
    4.16  include buildconfigs/Rules.mk
    4.17  
    4.18 @@ -19,7 +21,7 @@ build: $(LINUX_DIR)/include/linux/autoco
    4.19  	fi
    4.20  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    4.21  
    4.22 -$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    4.23 +$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
    4.24  	rm -rf $(LINUX_DIR)
    4.25  	cp -al $< $(LINUX_DIR)
    4.26  	# Apply arch-xen patches
    4.27 @@ -41,4 +43,4 @@ clean:
    4.28  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    4.29  
    4.30  delete: 
    4.31 -	rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
    4.32 +	rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
     5.1 --- a/buildconfigs/mk.linux-2.6-xen0	Sun May 08 08:37:12 2005 +0000
     5.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Thu May 12 13:05:04 2005 +0000
     5.3 @@ -1,3 +1,5 @@
     5.4 +
     5.5 +OS           = linux
     5.6  
     5.7  LINUX_SERIES = 2.6
     5.8  
     5.9 @@ -5,7 +7,7 @@ EXTRAVERSION = xen0
    5.10  
    5.11  FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
    5.12  
    5.13 -LINUX_DIR    = linux-$(FULLVERSION)
    5.14 +LINUX_DIR    = $(OS)-$(FULLVERSION)
    5.15  
    5.16  include buildconfigs/Rules.mk
    5.17  
    5.18 @@ -19,7 +21,7 @@ build: $(LINUX_DIR)/include/linux/autoco
    5.19  	fi
    5.20  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    5.21  
    5.22 -$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    5.23 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
    5.24  	rm -rf $(LINUX_DIR)
    5.25  	cp -al $< $(LINUX_DIR)
    5.26  	# Apply arch-xen patches
    5.27 @@ -40,4 +42,4 @@ clean:
    5.28  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    5.29  
    5.30  delete: 
    5.31 -	rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
    5.32 +	rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
     6.1 --- a/buildconfigs/mk.linux-2.6-xenU	Sun May 08 08:37:12 2005 +0000
     6.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Thu May 12 13:05:04 2005 +0000
     6.3 @@ -1,3 +1,5 @@
     6.4 +
     6.5 +OS           = linux
     6.6  
     6.7  LINUX_SERIES = 2.6
     6.8  
     6.9 @@ -5,7 +7,7 @@ EXTRAVERSION = xenU
    6.10  
    6.11  FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
    6.12  
    6.13 -LINUX_DIR    = linux-$(FULLVERSION)
    6.14 +LINUX_DIR    = $(OS)-$(FULLVERSION)
    6.15  
    6.16  include buildconfigs/Rules.mk
    6.17  
    6.18 @@ -19,7 +21,7 @@ build: $(LINUX_DIR)/include/linux/autoco
    6.19  	fi
    6.20  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    6.21  
    6.22 -$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    6.23 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
    6.24  	rm -rf $(LINUX_DIR)
    6.25  	cp -al $< $(LINUX_DIR)
    6.26  	# Apply arch-xen patches
    6.27 @@ -40,4 +42,4 @@ clean:
    6.28  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    6.29  
    6.30  delete: 
    6.31 -	rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
    6.32 +	rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
     7.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Sun May 08 08:37:12 2005 +0000
     7.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Thu May 12 13:05:04 2005 +0000
     7.3 @@ -1,3 +1,5 @@
     7.4 +
     7.5 +OS                = netbsd
     7.6  
     7.7  NETBSD_RELEASE   ?= 2.0
     7.8  NETBSD_CVSSNAP   ?= 20050309
     7.9 @@ -6,13 +8,13 @@ EXTRAVERSION = xenU
    7.10  
    7.11  FULLVERSION  = $(NETBSD_VER)-$(EXTRAVERSION)
    7.12  
    7.13 -NETBSD_DIR   = netbsd-$(FULLVERSION)
    7.14 +NETBSD_DIR   = $(OS)-$(FULLVERSION)
    7.15  
    7.16  .PHONY: build clean mrproper mkpatch
    7.17  
    7.18  include buildconfigs/Rules.mk
    7.19  
    7.20 -build: netbsd-$(EXTRAVERSION)
    7.21 +build: $(OS)-$(EXTRAVERSION)
    7.22  
    7.23  netbsd-%-tools.tar.bz2:
    7.24  	@echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path $(NETBSD_SRC_PATH)"
    7.25 @@ -22,7 +24,7 @@ netbsd-%-tools: netbsd-%-tools.tar.bz2
    7.26  	tar -jxf $<
    7.27  	touch $@ # update timestamp to avoid rebuild
    7.28  
    7.29 -$(NETBSD_DIR)/.valid: pristine-netbsd-$(NETBSD_VER)
    7.30 +$(NETBSD_DIR)/.valid: ref-$(OS)-$(NETBSD_VER)
    7.31  	$(RM) -rf $(NETBSD_DIR)
    7.32  	cp -al $< $(NETBSD_DIR)
    7.33  	# Apply arch-xen patches
    7.34 @@ -40,4 +42,4 @@ clean:
    7.35  	$(MAKE) -C netbsd-$(FULLVERSION) clean
    7.36  
    7.37  delete:
    7.38 -	rm -rf tmp-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
    7.39 +	rm -rf tmp-$(OS)-$(NETBSD_VER) $(NETBSD_DIR)