ia64/xen-unstable

changeset 4890:783e437809b6

bitkeeper revision 1.1159.258.119 (4283a888gsRWQWQLWB6wIgoYAW7l0Q)

Merge.
author cl349@firebug.cl.cam.ac.uk
date Thu May 12 19:03:36 2005 +0000 (2005-05-12)
parents 4a1ee13af3c2 dade12e98fcc
children 1c0f716646d1 24dfd18ea63e ddbb62813715
files BitKeeper/etc/ignore Makefile 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	Thu May 12 17:01:09 2005 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Thu May 12 19:03:36 2005 +0000
     1.3 @@ -52,6 +52,7 @@ netbsd-*-tools/*
     1.4  netbsd-*-xen0/*
     1.5  netbsd-*-xenU/*
     1.6  netbsd-*.patch
     1.7 +patches/*/.makedep
     1.8  patches/tmp/*
     1.9  pristine-*
    1.10  ref-*
    1.11 @@ -90,8 +91,3 @@ xen/tools/figlet/figlet
    1.12  xen/xen
    1.13  xen/xen-syms
    1.14  xen/xen.*
    1.15 -install/*
    1.16 -patches/ebtables-brnf-5_vs_2.4.25.diff
    1.17 -patches/ebtables.diff
    1.18 -tools/x2d2/minixend
    1.19 -BLOG
     2.1 --- a/Makefile	Thu May 12 17:01:09 2005 +0000
     2.2 +++ b/Makefile	Thu May 12 19:03:36 2005 +0000
     2.3 @@ -15,8 +15,6 @@ KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
     2.4  # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
     2.5  # You may use wildcards in the above e.g. KERNELS=*2.4*
     2.6  
     2.7 -ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
     2.8 -ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
     2.9  XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
    2.10  
    2.11  export DESTDIR
    2.12 @@ -86,7 +84,7 @@ world:
    2.13  	$(MAKE) dist
    2.14  
    2.15  # clean doesn't do a kclean
    2.16 -clean: 
    2.17 +clean:: 
    2.18  	$(MAKE) -C xen clean
    2.19  	$(MAKE) -C tools clean
    2.20  	$(MAKE) -C docs clean
     3.1 --- a/buildconfigs/Rules.mk	Thu May 12 17:01:09 2005 +0000
     3.2 +++ b/buildconfigs/Rules.mk	Thu May 12 19:03:36 2005 +0000
     3.3 @@ -4,6 +4,9 @@
     3.4  DISTDIR	?= $(CURDIR)/dist
     3.5  DESTDIR	?= $(DISTDIR)/install
     3.6  
     3.7 +ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
     3.8 +ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
     3.9 +
    3.10  .PHONY:	mkpatches mrproper
    3.11  
    3.12  # Setup pristine search path
    3.13 @@ -47,25 +50,29 @@ else
    3.14  OS_VER = $(NETBSD_VER)
    3.15  endif
    3.16  
    3.17 -pristine-%: %.tar.bz2
    3.18 -	rm -rf tmp-$(@F) $@
    3.19 -	mkdir -p tmp-$(@F)
    3.20 -	tar -C tmp-$(@F) -jxf $<
    3.21 -	mv tmp-$(@F)/* $@
    3.22 +$(patsubst %,pristine-%/.valid-pristine,$(ALLSPARSETREES)) : pristine-%/.valid-pristine: %.tar.bz2
    3.23 +	rm -rf tmp-pristine-$* $(@D)
    3.24 +	mkdir -p tmp-pristine-$*
    3.25 +	tar -C tmp-pristine-$* -jxf $<
    3.26 +	mv tmp-pristine-$*/* $(@D)
    3.27 +	@rm -rf tmp-pristine-$*
    3.28  	touch $@ # update timestamp to avoid rebuild
    3.29 -	@rm -rf tmp-$(@F)
    3.30 +
    3.31 +PATCHDIRS := $(wildcard patches/*-*)
    3.32 +
    3.33 +-include $(patsubst %,%/.makedep,$(PATCHDIRS))
    3.34  
    3.35 -OS_PATCHES = $(shell if [[ -e patches/$(OS)-$(OS_VER) ]]; then \
    3.36 -               echo patches/$(OS)-$(OS_VER)/*.patch; fi)
    3.37 +$(patsubst patches/%,patches/%/.makedep,$(PATCHDIRS)): patches/%/.makedep: 
    3.38 +	@echo 'ref-$*/.valid-ref: $$(wildcard patches/$*/*.patch)' >$@
    3.39  
    3.40 +clean::
    3.41 +	rm -f patches/*/.makedep
    3.42  
    3.43 -ref-%: pristine-% $(OS_PATCHES)
    3.44 -	rm -rf $@
    3.45 -	cp -al $< tmp-$(@F)
    3.46 +ref-%/.valid-ref: pristine-%/.valid-pristine
    3.47 +	rm -rf $(@D)
    3.48 +	cp -al $(<D) $(@D)
    3.49  	[ -d patches/$* ] && \
    3.50 -	  for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) ; done || \
    3.51 -	  true
    3.52 -	mv tmp-$(@F) $@
    3.53 +	  for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done
    3.54  	touch $@ # update timestamp to avoid rebuild
    3.55  
    3.56  %-build:
    3.57 @@ -77,11 +84,11 @@ ref-%: pristine-% $(OS_PATCHES)
    3.58  %-clean:
    3.59  	$(MAKE) -f buildconfigs/mk.$* clean
    3.60  
    3.61 -%-xen.patch: ref-%
    3.62 +%-xen.patch: ref-%/.valid-ref
    3.63  	rm -rf tmp-$@
    3.64 -	cp -al $< tmp-$@
    3.65 +	cp -al $(<D) tmp-$@
    3.66  	( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )	
    3.67 -	diff -Nurp $< tmp-$@ > $@ || true
    3.68 +	diff -Nurp $(<D) tmp-$@ > $@ || true
    3.69  	rm -rf tmp-$@
    3.70  
    3.71  %-mrproper: %-mrproper-extra
     4.1 --- a/buildconfigs/mk.linux-2.4-xen0	Thu May 12 17:01:09 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Thu May 12 19:03:36 2005 +0000
     4.3 @@ -24,9 +24,9 @@ patches/tmp/ebtables.diff:
     4.4  	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
     4.5  
     4.6  $(LINUX_DIR)/include/linux/autoconf.h: patches/tmp/ebtables.diff
     4.7 -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
     4.8 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
     4.9  	rm -rf $(LINUX_DIR)
    4.10 -	cp -al $< $(LINUX_DIR)
    4.11 +	cp -al $(<D) $(LINUX_DIR)
    4.12  	# Apply arch-xen patches
    4.13  	( cd linux-$(LINUX_VER)-xen-sparse ; \
    4.14            ./mkbuildtree ../$(LINUX_DIR) )
    4.15 @@ -45,7 +45,7 @@ patches/tmp/ebtables.diff:
    4.16  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    4.17  	make -C $(LINUX_DIR) ARCH=xen dep
    4.18  
    4.19 -clean:
    4.20 +clean::
    4.21  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    4.22  
    4.23  delete: 
     5.1 --- a/buildconfigs/mk.linux-2.4-xenU	Thu May 12 17:01:09 2005 +0000
     5.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Thu May 12 19:03:36 2005 +0000
     5.3 @@ -19,9 +19,9 @@ build: $(LINUX_DIR)/include/linux/autoco
     5.4  	fi
     5.5  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
     5.6  
     5.7 -$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
     5.8 +$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
     5.9  	rm -rf $(LINUX_DIR)
    5.10 -	cp -al $< $(LINUX_DIR)
    5.11 +	cp -al $(<D) $(LINUX_DIR)
    5.12  	# Apply arch-xen patches
    5.13  	( cd linux-$(LINUX_VER)-xen-sparse ; \
    5.14            ./mkbuildtree ../$(LINUX_DIR) )
    5.15 @@ -38,7 +38,7 @@ build: $(LINUX_DIR)/include/linux/autoco
    5.16  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    5.17  	make -C $(LINUX_DIR) ARCH=xen dep
    5.18  
    5.19 -clean:
    5.20 +clean::
    5.21  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    5.22  
    5.23  delete: 
     6.1 --- a/buildconfigs/mk.linux-2.6-xen0	Thu May 12 17:01:09 2005 +0000
     6.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Thu May 12 19:03:36 2005 +0000
     6.3 @@ -19,9 +19,9 @@ build: $(LINUX_DIR)/include/linux/autoco
     6.4  	fi
     6.5  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
     6.6  
     6.7 -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
     6.8 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
     6.9  	rm -rf $(LINUX_DIR)
    6.10 -	cp -al $< $(LINUX_DIR)
    6.11 +	cp -al $(<D) $(LINUX_DIR)
    6.12  	# Apply arch-xen patches
    6.13  	( cd linux-$(LINUX_VER)-xen-sparse ; \
    6.14            ./mkbuildtree ../$(LINUX_DIR) )
    6.15 @@ -37,7 +37,7 @@ build: $(LINUX_DIR)/include/linux/autoco
    6.16  		$(LINUX_DIR)/.config
    6.17  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    6.18  
    6.19 -clean:
    6.20 +clean::
    6.21  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    6.22  
    6.23  delete: 
     7.1 --- a/buildconfigs/mk.linux-2.6-xenU	Thu May 12 17:01:09 2005 +0000
     7.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Thu May 12 19:03:36 2005 +0000
     7.3 @@ -19,9 +19,9 @@ build: $(LINUX_DIR)/include/linux/autoco
     7.4  	fi
     7.5  	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
     7.6  
     7.7 -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
     7.8 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
     7.9  	rm -rf $(LINUX_DIR)
    7.10 -	cp -al $< $(LINUX_DIR)
    7.11 +	cp -al $(<D) $(LINUX_DIR)
    7.12  	# Apply arch-xen patches
    7.13  	( cd linux-$(LINUX_VER)-xen-sparse ; \
    7.14            ./mkbuildtree ../$(LINUX_DIR) )
    7.15 @@ -37,7 +37,7 @@ build: $(LINUX_DIR)/include/linux/autoco
    7.16  		$(LINUX_DIR)/.config
    7.17  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    7.18  
    7.19 -clean:
    7.20 +clean::
    7.21  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    7.22  
    7.23  delete: 
     8.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Thu May 12 17:01:09 2005 +0000
     8.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Thu May 12 19:03:36 2005 +0000
     8.3 @@ -24,9 +24,9 @@ netbsd-%-tools: netbsd-%-tools.tar.bz2
     8.4  	tar -jxf $<
     8.5  	touch $@ # update timestamp to avoid rebuild
     8.6  
     8.7 -$(NETBSD_DIR)/.valid: ref-$(OS)-$(NETBSD_VER)
     8.8 +$(NETBSD_DIR)/.valid: ref-$(OS)-$(NETBSD_VER)/.valid-ref
     8.9  	$(RM) -rf $(NETBSD_DIR)
    8.10 -	cp -al $< $(NETBSD_DIR)
    8.11 +	cp -al $(<D) $(NETBSD_DIR)
    8.12  	# Apply arch-xen patches
    8.13  	( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
    8.14            ./mkbuildtree ../$(NETBSD_DIR) )
    8.15 @@ -38,7 +38,7 @@ netbsd-xen%: $(NETBSD_DIR)/.valid netbsd
    8.16  	$(MAKE) -C netbsd-$(FULLVERSION) netbsd
    8.17  	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
    8.18  
    8.19 -clean:
    8.20 +clean::
    8.21  	$(MAKE) -C netbsd-$(FULLVERSION) clean
    8.22  
    8.23  delete: