aboutsummaryrefslogtreecommitdiffstats
path: root/buildconfigs/src.git-clone
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-04-07 15:44:29 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-04-07 15:44:29 +0100
commit35e9666fc49c2e30753f671b1e8f72501b4c1409 (patch)
tree13d5573b43d3f1fdfc824ec7c44690849c613c93 /buildconfigs/src.git-clone
parentab3575f91307009ce8378a020e5dd974aa262484 (diff)
downloadxen-35e9666fc49c2e30753f671b1e8f72501b4c1409.tar.gz
xen-35e9666fc49c2e30753f671b1e8f72501b4c1409.tar.bz2
xen-35e9666fc49c2e30753f671b1e8f72501b4c1409.zip
Revert 21110:d791173ca65b and 21111:986d3b1d30fb
Break automated tests. Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'buildconfigs/src.git-clone')
-rw-r--r--buildconfigs/src.git-clone6
1 files changed, 4 insertions, 2 deletions
diff --git a/buildconfigs/src.git-clone b/buildconfigs/src.git-clone
index 6b32dae355..b871202689 100644
--- 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 $@