[Xen-changelog] [xen-unstable] Revert 21110:d791173ca65b and 21111:986d3b1d30fb

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1270651469 -3600
# Node ID f0ef396d8c334100293fcba75ee89f311811b9f2
# Parent  3376c90960e83d9f1e34d51601a930290a128c09
Revert 21110:d791173ca65b and 21111:986d3b1d30fb

Break automated tests.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 buildconfigs/mk.linux-2.6-pvops |    2 +-
 buildconfigs/src.git-clone      |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff -r 3376c90960e8 -r f0ef396d8c33 buildconfigs/mk.linux-2.6-pvops
--- a/buildconfigs/mk.linux-2.6-pvops   Wed Apr 07 10:17:27 2010 +0100
+++ b/buildconfigs/mk.linux-2.6-pvops   Wed Apr 07 15:44:29 2010 +0100
@@ -10,7 +10,7 @@ else
 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 -r 3376c90960e8 -r f0ef396d8c33 buildconfigs/src.git-clone
--- a/buildconfigs/src.git-clone        Wed Apr 07 10:17:27 2010 +0100
+++ b/buildconfigs/src.git-clone        Wed Apr 07 15:44:29 2010 +0100
@@ -23,7 +23,9 @@ XEN_LINUX_GITREV  ?=
        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 $@

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