bitkeeper revision 1.1159.151.2 (41880853o8v3vRZnyX0vFPNvy-RJ8A)

Makefile improvements

diff --git a/.rootkeys b/.rootkeys
index 9dd3e38f593ca4bc5db1fd2f2dd99a6b02bfda69..0fdbcffd4a47b58a65981aae75e675c875340566 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -5,6 +5,11 @@
 4177dbbfqsi01p2zgZa0geUOgScONw COPYING
 3eb788d6Kleck_Cut0ouGneviGzliQ Makefile
 3f5ef5a24IaQasQE2tyMxrfxskMmvw README
+41880852AtdVfSsfKGtrLdajX1vEXQ buildconfigs/Rules.mk
+41880852oSxvHJSmnzI6hlpFvHuQqQ buildconfigs/linux-2.4-xen0
+41880852YWbPAO-cofTsGkFW1x7tGw buildconfigs/linux-2.4-xenU
+41880852Cwk_14PhDA9XZToJ5B2iMQ buildconfigs/linux-2.6-xen0
+41880852siMCKilMpoBLtpP_bhYC2Q buildconfigs/linux-2.6-xenU
 3f9e7d53iC47UnlfORp9iC1vai6kWw docs/Makefile
 3f9e7d60PWZJeVh5xdnk0nLUdxlqEA docs/figs/xenlogo.eps
 418273f3YZUyGIrNbERVAPFeOd9gww docs/figs/xenserver.obj

diff --git a/Makefile b/Makefile
index 3147e518d8a54fefd4aa1a8ccdcedcdd51683bc6..840ea59632906e0b67551b47b08887ef09c73983 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,204 +8,65 @@ SOURCEFORGE_MIRROR := http://heanet.dl.sourceforge.net/sourceforge
 #http://voxel.dl.sourceforge.net/sourceforge/
 #http://easynews.dl.sourceforge.net/sourceforge
 
-.PHONY: docs delete-symlinks clean
+#KERNELS = linux-2.6-xen0 linux-2.6-xenU linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
+KERNELS = linux-2.6-xen0 linux-2.6-xenU
 
-# a not partcularly useful but safe default target
-all: make-symlinks
+export INSTALL_DIR SOURCEFORGE_MIRROR
+
+.PHONY: all dist install kernels kdelete mkpatches world docs clean mrproper
+
+all: 
        $(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install
        $(MAKE) prefix=$(INSTALL_DIR) dist=yes -C tools install
+       $(MAKE) kernels
+
+# install xen and tools into the install directory
+dist: all
+
 
 # install everything into the standard system directories
-install: dist
+# NB: install explicitly does not check that everything is up to date!
+install: 
        $(MAKE) -C xen install
        $(MAKE) -C tools install
-       $(shell cp -a install/boot/*$(LINUX_VER)* /boot/)
+       $(shell cp -a install/boot/* /boot/)
        $(shell cp -a install/lib/modules/* /lib/modules/)
 
-# install xen and tools into the install directory
-dist: all
-       $(MAKE) linux-xenU
-       $(MAKE) linux-xen0
-
-LINUX_RELEASE    ?= 2.6
-LINUX_VER        ?= $(shell ( /bin/ls -ld linux-$(LINUX_RELEASE).*-xen-sparse ) 2>/dev/null | \
-                     sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
-LINUX26_VER      ?= $(shell ( /bin/ls -ld linux-2.6.*-xen-sparse ) 2>/dev/null | \
-                     sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
-LINUX_CONFIG_DIR ?= $(INSTALL_DIR)/boot
-LINUX_SRC_PATH   ?= .:..
-LINUX_SRC        ?= $(firstword $(foreach dir,$(subst :, ,$(LINUX_SRC_PATH)),\
-                    $(wildcard $(dir)/linux-$(LINUX_VER).tar.*z*)))
-
-# search for a pristine kernel tar ball, or try downloading one
-pristine-linux-src: 
-ifeq ($(LINUX_SRC),)
-       @echo "Cannot find linux-$(LINUX_VER).tar.gz in path $(LINUX_SRC_PATH)"
-       @wget http://www.kernel.org/pub/linux/kernel/v$(LINUX_RELEASE)/linux-$(LINUX_VER).tar.bz2 -O./linux-$(LINUX_VER).tar.bz2
-LINUX_SRC := ./linux-$(LINUX_VER).tar.bz2 
-endif
-
-patches/ebtables.diff:
-       mkdir -p patches
-       #wget $(SOURCEFORGE_MIRROR)/ebtables/ebtables-brnf-5_vs_2.4.25.diff.gz \
-            -O- | gunzip -c > $@
-       wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
-
-LINUX_TREES := linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
-
-# make a linux-xen build tree from a pristine kernel plus sparse tree
-ifeq ($(LINUX_RELEASE),2.4)
-mk-linux-trees: patches/ebtables.diff pristine-linux-src 
-       $(RM) -rf $(LINUX_TREES)
-       echo $(LINUX_SRC) | grep -q bz2 && \
-           tar -jxf $(LINUX_SRC) || tar -zxf $(LINUX_SRC)
-       mv linux-$(LINUX_VER) linux-$(LINUX_VER)-xen0
-       ( cd linux-$(LINUX_VER)-xen-sparse ; \
-          ./mkbuildtree ../linux-$(LINUX_VER)-xen0 )
-       cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
-       ( cd linux-$(LINUX_VER)-xen0 ; \
-          patch -p1 -F3 < ../patches/ebtables.diff ; \
-          sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \
-          rm -f Makefile ; mv Mk.tmp Makefile )
-       ( cd linux-$(LINUX_VER)-xenU ; \
-          sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \
-          rm -f Makefile ; mv Mk.tmp Makefile )
-else
-mk-linux-trees: pristine-linux-src 
-       $(RM) -rf $(LINUX_TREES)
-       echo $(LINUX_SRC) | grep -q bz2 && \
-           tar -jxf $(LINUX_SRC) || tar -zxf $(LINUX_SRC)
-       mv linux-$(LINUX_VER) linux-$(LINUX_VER)-xen0
-       ( cd linux-$(LINUX_VER)-xen-sparse ; \
-          ./mkbuildtree ../linux-$(LINUX_VER)-xen0 )
-       cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
-       ( cd linux-$(LINUX_VER)-xen0 ; \
-          sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \
-          rm -f Makefile ; mv Mk.tmp Makefile )
-       ( cd linux-$(LINUX_VER)-xenU ; \
-          sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \
-          rm -f Makefile ; mv Mk.tmp Makefile )
-endif
-
-# configure the specified linux tree
-CDIR = $(subst config-,linux-$(LINUX_VER)-,$@)
-ifeq ($(LINUX_RELEASE),2.4)
-config-xen%:
-       $(MAKE) -C $(CDIR) ARCH=xen mrproper
-       cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)$(subst config,,$@) \
-           $(CDIR)/.config || \
-           $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config
-       $(MAKE) -C $(CDIR) ARCH=xen oldconfig
-       $(MAKE) -C $(CDIR) ARCH=xen dep
-else
-config-xen%:
-       $(MAKE) -C $(CDIR) ARCH=xen mrproper
-       @[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \
-         && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
-               $(CDIR)/.config || \
-       $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig
-endif
-
-# build the specified linux tree
-BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@)
-linux-xen%:    
-       $(MAKE) -C $(BDIR) ARCH=xen modules
-       $(MAKE) -C $(BDIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) \
-           modules_install
-       $(MAKE) -C $(BDIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
-
-NETBSD_RELEASE   ?= 2.0
-NETBSD_VER       ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \
-                     sed -e 's!^.*netbsd-\(.\+\)-xen-sparse!\1!' )
-NETBSD_CVSSNAP   ?= 20040906
-NETBSD_SRC_PATH  ?= .:..
-NETBSD_SRC       ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
-                    $(wildcard $(dir)/netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.*z*)))
-NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
-                    $(wildcard $(dir)/netbsd-$(NETBSD_VER)-tools.tar.*z*)))
-
-NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU
-
-pristine-netbsd-src: 
-ifeq ($(NETBSD_SRC),)
-       @echo "Cannot find netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.gz in path $(NETBSD_SRC_PATH)"
-       @wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 -O./netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
-NETBSD_SRC := ./netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 
-endif
-
-pristine-netbsd-tools-src: 
-ifeq ($(NETBSD_TOOLS_SRC),)
-       @echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path $(NETBSD_SRC_PATH)"
-       @wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/netbsd-$(NETBSD_VER)-tools.tar.bz2 -O./netbsd-$(NETBSD_VER)-tools.tar.bz2
-NETBSD_TOOLS_SRC := ./netbsd-$(NETBSD_VER)-tools.tar.bz2 
-endif
-
-netbsd-tools: pristine-netbsd-tools-src
-       @[ -d netbsd-$(NETBSD_RELEASE)-tools ] || { \
-               echo extract $(NETBSD_TOOLS_SRC); \
-               tar -jxf $(NETBSD_TOOLS_SRC); }
-
-mk-netbsd-trees: netbsd-tools pristine-netbsd-src 
-       $(RM) -rf $(NETBSD_TREES)
-       echo $(NETBSD_SRC) | grep -q bz2 && \
-           tar -jxf $(NETBSD_SRC) || tar -zxf $(NETBSD_SRC)
-       mv netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP) \
-           netbsd-$(NETBSD_VER)-xenU
-       ( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
-          ./mkbuildtree ../netbsd-$(NETBSD_VER)-xenU )
-
-# build the specified netbsd tree
-NBDIR = $(subst netbsd-,netbsd-$(NETBSD_VER)-,$@)
-netbsd-xen%:   
-       $(MAKE) -C $(NBDIR) config
-       $(MAKE) -C $(NBDIR) netbsd
-       $(MAKE) -C $(NBDIR) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
+# Build all the various kernels
+kernels:
+       for i in $(KERNELS) ; do $(MAKE) -f buildconfigs/$$i build ; done
+
+# Delete the kernel build trees
+kdelete:
+       for i in $(KERNELS) ; do $(MAKE) -f buildconfigs/$$i kdelete ; done
+
+# Make patches from kernel sparse trees
+mkpatches:
+       $(MAKE) -f buildconfigs/Rules.mk mkpatches
+
 
 # build xen, the tools, and a domain 0 plus unprivileged linux-xen images,
 # and place them in the install directory. 'make install' should then
 # copy them to the normal system directories
 world:
        $(MAKE) clean
+       $(MAKE) kdelete
        $(MAKE) all
-       $(MAKE) mk-linux-trees
-       $(MAKE) config-xenU
-       $(MAKE) linux-xenU
-       $(MAKE) config-xen0
-       $(MAKE) linux-xen0
        $(MAKE) docs
 
-linux26:
-       $(MAKE) LINUX_RELEASE=2.6 mk-linux-trees
-       $(MAKE) LINUX_RELEASE=2.6 config-xenU
-       $(MAKE) LINUX_RELEASE=2.6 linux-xenU
-       $(MAKE) LINUX_RELEASE=2.6 config-xen0
-       $(MAKE) LINUX_RELEASE=2.6 linux-xen0
-
-linux24:
-       $(MAKE) LINUX_RELEASE=2.4 mk-linux-trees
-       $(MAKE) LINUX_RELEASE=2.4 config-xenU
-       $(MAKE) LINUX_RELEASE=2.4 linux-xenU
-       $(MAKE) LINUX_RELEASE=2.4 config-xen0
-       $(MAKE) LINUX_RELEASE=2.4 linux-xen0
-
-netbsd:
-       $(MAKE) mk-netbsd-trees
-       $(MAKE) netbsd-xenU
+docs:
+       $(MAKE) -C docs all || true
 
-clean: delete-symlinks
+clean: 
        $(MAKE) -C xen clean
        $(MAKE) -C tools clean
        $(MAKE) -C docs clean
 
-# clean, but blow away linux build tree plus src tar ball
+# clean, but blow away kernel build tree plus tar balls
 mrproper: clean
-       rm -rf install/* patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
-
-make-symlinks: delete-symlinks
-       ln -sf linux-$(LINUX26_VER)-xen-sparse linux-xen-sparse
-
-delete-symlinks:
-       $(RM) linux-xen-sparse
+       rm -rf install/* patches *.tar.bz2 
+       for i in `ls buildconfigs | grep -v Rules.mk` ; do $(MAKE) -f buildconfigs/$$i kdelete || true ; done
+       $(MAKE) -f buildconfigs/Rules.mk mrproper
 
 # handy target to install twisted (use rpm or apt-get in preference)
 install-twisted:
@@ -226,9 +87,18 @@ install-iptables:
        ( cd iptables-* ; \
          make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install)
 
+# Use this target with extreme care!
 uninstall:
        cp -a /etc/xen /etc/xen.old && rm -rf /etc/xen 
-       rm -rf "/usr/lib/python2.2/site-packages/xen* /usr/lib/libxc* /usr/lib/python2.2/site-packages/Xc*"
+       rm -rf "/usr/lib/python2.?/site-packages/xen* /usr/lib/libxc* /usr/lib/python2.?/site-packages/Xc*"
+
+# Legacy target for compatibility
+linux24:
+       $(MAKE) -f buildconfigs/linux-2.4-xen0
+       $(MAKE) -f buildconfigs/linux-2.4-xenU
+
+# Legacy target for compatibility
+linux26:
+       $(MAKE) -f buildconfigs/linux-2.6-xen0
+       $(MAKE) -f buildconfigs/linux-2.6-xenU
 
-docs:
-       $(MAKE) -C docs all || true

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
new file mode 100644 (file)
index 0000000..6f1caf7
--- /dev/null
+++ b/buildconfigs/Rules.mk
@@ -0,0 +1,64 @@
+
+LINUX_26VER ?= $(shell ( /bin/ls -ld linux-2.6.*-xen-sparse ) \
+               2>/dev/null | sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
+
+LINUX_24VER ?= $(shell ( /bin/ls -ld linux-2.4.*-xen-sparse ) \
+               2>/dev/null | sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
+
+LINUX_SRC_PATH   ?= .:..
+
+LINUX_26SRC      ?= $(firstword $(foreach dir,$(subst :, ,$(LINUX_SRC_PATH)),\
+                    $(wildcard $(dir)/linux-$(LINUX_26VER).tar.*z*)))
+
+LINUX_24SRC      ?= $(firstword $(foreach dir,$(subst :, ,$(LINUX_SRC_PATH)),\
+                    $(wildcard $(dir)/linux-$(LINUX_24VER).tar.*z*)))
+
+.PHONY:        mkpatches linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch mrproper
+
+# search for a pristine kernel tar ball, or try downloading one
+linux-$(LINUX_26VER).tar.bz2:
+ifeq ($(LINUX_26SRC),)
+       echo "Cannot find linux-$(LINUX_26VER).tar.bz2 in path $(LINUX_SRC_PATH)"
+       wget http://www.kernel.org/pub/linux/kernel/v2.6/linux-$(LINUX_26VER).tar.bz2 -O./linux-$(LINUX_26VER).tar.bz2
+LINUX_26SRC := ./linux-$(LINUX_26VER).tar.bz2 
+endif
+
+pristine-linux-$(LINUX_26VER): $(LINUX_26SRC)
+       rm -rf tmp $@ && mkdir -p tmp && tar -C tmp -jxf $(LINUX_26SRC) && mv tmp/* $@
+       touch $@ # update timestamp to avoid rebuild
+
+
+# search for a pristine kernel tar ball, or try downloading one
+linux-$(LINUX_24VER).tar.bz2:
+ifeq ($(LINUX_24SRC),)
+       echo "Cannot find linux-$(LINUX_24VER).tar.bz2 in path $(LINUX_SRC_PATH)"
+       wget http://www.kernel.org/pub/linux/kernel/v2.4/linux-$(LINUX_24VER).tar.bz2 -O./linux-$(LINUX_24VER).tar.bz2
+LINUX_24SRC := ./linux-$(LINUX_24VER).tar.bz2 
+endif
+
+pristine-linux-$(LINUX_24VER): $(LINUX_24SRC)
+       rm -rf tmp $@ && mkdir -p tmp && tar -C tmp -jxf $(LINUX_24SRC) && mv tmp/* $@
+       touch $@ # update timestamp to avoid rebuild
+
+linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER)  
+       rm -rf tmp-$@
+       cp -al pristine-linux-$(LINUX_24VER) tmp-$@
+       ( cd linux-$(LINUX_24VER)-xen-sparse ; \
+          ./mkbuildtree ../tmp-$@ )    
+       diff -Nurp pristine-linux-$(LINUX_24VER) tmp-$@ > $@ || true
+       rm -rf tmp-$@
+
+linux-$(LINUX_26VER)-xen.patch: pristine-linux-$(LINUX_26VER)
+       rm -rf tmp-$@
+       cp -al pristine-linux-$(LINUX_26VER) tmp-$@
+       ( cd linux-$(LINUX_26VER)-xen-sparse ; \
+          ./mkbuildtree ../tmp-$@ )    
+       diff -Nurp pristine-linux-$(LINUX_26VER) tmp-$@ > $@ || true
+       rm -rf tmp-$@
+
+mkpatches: linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
+
+mrproper:
+       rm -rf pristine-linux-$(LINUX_24VER) linux-$(LINUX_24VER).tar.bz2
+       rm -rf pristine-linux-$(LINUX_26VER) linux-$(LINUX_26VER).tar.bz2
+       rm -rf linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
\ No newline at end of file

diff --git a/buildconfigs/linux-2.4-xen0 b/buildconfigs/linux-2.4-xen0
new file mode 100644 (file)
index 0000000..7f13f52
--- /dev/null
+++ b/buildconfigs/linux-2.4-xen0
@@ -0,0 +1,53 @@
+
+EXTRAVERSION = xen0
+
+FULLVERSION  = $(LINUX_24VER)-$(EXTRAVERSION)
+
+LINUX_DIR    = linux-$(FULLVERSION)
+
+.PHONY: build clean mrproper mkpatch
+
+include buildconfigs/Rules.mk
+
+.PHONY: build clean mrproper mkpatch
+
+
+patches/ebtables.diff:
+       mkdir -p patches
+       wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
+
+# The real action starts here!
+$(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
+       rm -rf $(LINUX_DIR)
+       cp -al pristine-linux-$(LINUX_24VER) $(LINUX_DIR)
+       # Apply arch-xen patches
+       ( cd linux-$(LINUX_24VER)-xen-sparse ; \
+          ./mkbuildtree ../$(LINUX_DIR) )
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
+       # add ebtables patch
+       ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/ebtables.diff )
+       # Re-use config from install dir if one exits else use make defconfig
+       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config
+       make -C $(LINUX_DIR) ARCH=xen oldconfig
+       make -C $(LINUX_DIR) ARCH=xen dep
+
+build: $(LINUX_DIR)
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+
+clean:
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
+
+kdelete: 
+       rm -rf tmp $(LINUX_DIR) 
+
+
+
+
+
+
+

diff --git a/buildconfigs/linux-2.4-xenU b/buildconfigs/linux-2.4-xenU
new file mode 100644 (file)
index 0000000..e849da9
--- /dev/null
+++ b/buildconfigs/linux-2.4-xenU
@@ -0,0 +1,51 @@
+
+EXTRAVERSION = xenU
+
+FULLVERSION  = $(LINUX_24VER)-$(EXTRAVERSION)
+
+LINUX_DIR    = linux-$(FULLVERSION)
+
+.PHONY: build clean mrproper mkpatch
+
+include buildconfigs/Rules.mk
+
+.PHONY: build clean mrproper mkpatch
+
+
+patches/ebtables.diff:
+       mkdir -p patches
+       wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
+
+# The real action starts here!
+$(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
+       rm -rf $(LINUX_DIR)
+       cp -al pristine-linux-$(LINUX_24VER) $(LINUX_DIR)
+       # Apply arch-xen patches
+       ( cd linux-$(LINUX_24VER)-xen-sparse ; \
+          ./mkbuildtree ../$(LINUX_DIR) )
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
+       # Re-use config from install dir if one exits else use make defconfig
+       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config
+       make -C $(LINUX_DIR) ARCH=xen oldconfig
+       make -C $(LINUX_DIR) ARCH=xen dep
+
+build: $(LINUX_DIR)
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen modules        
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+
+clean:
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
+
+kdelete: 
+       rm -rf tmp $(LINUX_DIR) 
+
+
+
+
+
+
+

diff --git a/buildconfigs/linux-2.6-xen0 b/buildconfigs/linux-2.6-xen0
new file mode 100644 (file)
index 0000000..32f9be1
--- /dev/null
+++ b/buildconfigs/linux-2.6-xen0
@@ -0,0 +1,45 @@
+
+EXTRAVERSION = xen0
+
+FULLVERSION  = $(LINUX_26VER)-$(EXTRAVERSION)
+
+LINUX_DIR    = linux-$(FULLVERSION)
+
+.PHONY: build clean mrproper mkpatch
+
+include buildconfigs/Rules.mk
+
+.PHONY: build clean mrproper mkpatch
+
+# The real action starts here!
+$(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
+       rm -rf $(LINUX_DIR)
+       cp -al pristine-linux-$(LINUX_26VER) $(LINUX_DIR)
+       # Apply arch-xen patches
+       ( cd linux-$(LINUX_26VER)-xen-sparse ; \
+          ./mkbuildtree ../$(LINUX_DIR) )
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
+       # Re-use config from install dir if one exits else use make defconfig
+       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
+       make -C $(LINUX_DIR) ARCH=xen oldconfig
+
+build: $(LINUX_DIR)
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+
+clean:
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
+
+kdelete: 
+       rm -rf tmp $(LINUX_DIR) 
+
+
+
+
+
+
+

diff --git a/buildconfigs/linux-2.6-xenU b/buildconfigs/linux-2.6-xenU
new file mode 100644 (file)
index 0000000..eb25a70
--- /dev/null
+++ b/buildconfigs/linux-2.6-xenU
@@ -0,0 +1,45 @@
+
+EXTRAVERSION = xenU
+
+FULLVERSION  = $(LINUX_26VER)-$(EXTRAVERSION)
+
+LINUX_DIR    = linux-$(FULLVERSION)
+
+.PHONY: build clean mrproper mkpatch
+
+include buildconfigs/Rules.mk
+
+.PHONY: build clean mrproper mkpatch
+
+# The real action starts here!
+$(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
+       rm -rf $(LINUX_DIR)
+       cp -al pristine-linux-$(LINUX_26VER) $(LINUX_DIR)
+       # Apply arch-xen patches
+       ( cd linux-$(LINUX_26VER)-xen-sparse ; \
+          ./mkbuildtree ../$(LINUX_DIR) )
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
+       # Re-use config from install dir if one exits else use make defconfig
+       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
+       make -C $(LINUX_DIR) ARCH=xen oldconfig
+
+build: $(LINUX_DIR)
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+
+clean:
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
+
+kdelete: 
+       rm -rf tmp $(LINUX_DIR) 
+
+
+
+
+
+
+