Revert 21110:d791173ca65b and 21111:986d3b1d30fb

Break automated tests.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/buildconfigs/mk.linux-2.6-pvops b/buildconfigs/mk.linux-2.6-pvops
index 002a247f748ab7f20c5c11063d21e196a85a67a9..904eb56f0ac1f2d0f7555ae0ad28c5cf55abe996 100644 (file)
--- a/buildconfigs/mk.linux-2.6-pvops
+++ b/buildconfigs/mk.linux-2.6-pvops
@@ -10,7 +10,7 @@ XEN_LINUX_GIT_URL ?= http://www.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.g
 else
 XEN_LINUX_GIT_URL ?= git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
 endif
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/master
 
 EXTRAVERSION ?=
 

diff --git a/buildconfigs/src.git-clone b/buildconfigs/src.git-clone
index 6b32dae355c4023a39f1099082c5da588a4bc0d6..b8712026890afbf238dd78d7d8975a13ba4a35c0 100644 (file)
--- a/buildconfigs/src.git-clone
+++ b/buildconfigs/src.git-clone
@@ -23,7 +23,9 @@ $(LINUX_SRCDIR)/.valid-src: $(__XEN_LINUX_UPDATE)
        if ! [ -d $(LINUX_SRCDIR) ]; then \
                rm -rf $(LINUX_SRCDIR) $(LINUX_SRCDIR).tmp; \
                mkdir $(LINUX_SRCDIR).tmp; rmdir $(LINUX_SRCDIR).tmp; \
-               $(GIT) clone -o xen -b $(XEN_LINUX_GIT_REMOTEBRANCH) $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
-               mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
+               $(GIT) clone $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
+               cd $(LINUX_SRCDIR).tmp; \
+               $(GIT) checkout $(XEN_LINUX_GIT_REMOTEBRANCH); \
+               cd ..; mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
        fi
        touch $@