[Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1431, 2005/05/12 14:08:06+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        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



 Rules.mk          |    6 ++++++
 mk.linux-2.4-xen0 |    5 +++++
 mk.linux-2.4-xenU |    5 +++++
 mk.linux-2.6-xen0 |    6 +++++-
 mk.linux-2.6-xenU |    6 +++++-
 5 files changed, 26 insertions(+), 2 deletions(-)


diff -Nru a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     2005-05-12 10:04:02 -04:00
+++ b/buildconfigs/Rules.mk     2005-05-12 10:04:02 -04:00
@@ -1,4 +1,6 @@
 
+include Config.mk
+
 # We expect these two to already be set if people 
 # are using the top-level Makefile
 DISTDIR        ?= $(CURDIR)/dist
@@ -53,6 +55,7 @@
        tar -C tmp-$(@F) -jxf $<
        mv tmp-$(@F)/* $@
        touch $@ # update timestamp to avoid rebuild
+       touch $@/.bk_skip
        @rm -rf tmp-$(@F)
 
 OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch)
@@ -74,6 +77,9 @@
 
 %-clean:
        $(MAKE) -f buildconfigs/mk.$* clean
+
+%-config:
+       $(MAKE) -f buildconfigs/mk.$* config
 
 %-xen.patch: ref-%
        rm -rf tmp-$@
diff -Nru a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
--- a/buildconfigs/mk.linux-2.4-xen0    2005-05-12 10:04:02 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0    2005-05-12 10:04:02 -04:00
@@ -46,6 +46,11 @@
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
 
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
+
 clean:
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
diff -Nru a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
--- a/buildconfigs/mk.linux-2.4-xenU    2005-05-12 10:04:02 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU    2005-05-12 10:04:02 -04:00
@@ -39,6 +39,11 @@
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
 
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
+
 clean:
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
diff -Nru a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0    2005-05-12 10:04:02 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0    2005-05-12 10:04:02 -04:00
@@ -34,9 +34,13 @@
        # Re-use config from install dir if one exits else use default config
        [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
          cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
-         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+         || cp 
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
+
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 
 clean:
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU    2005-05-12 10:04:02 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU    2005-05-12 10:04:02 -04:00
@@ -34,9 +34,13 @@
        # Re-use config from install dir if one exits else use default config
        [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
          cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
-         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+         || cp 
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
+
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 
 clean:
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog