diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-04-07 15:44:29 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-04-07 15:44:29 +0100 |
| commit | 35e9666fc49c2e30753f671b1e8f72501b4c1409 (patch) | |
| tree | 13d5573b43d3f1fdfc824ec7c44690849c613c93 /buildconfigs | |
| parent | ab3575f91307009ce8378a020e5dd974aa262484 (diff) | |
| download | xen-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')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-pvops | 2 | ||||
| -rw-r--r-- | buildconfigs/src.git-clone | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/buildconfigs/mk.linux-2.6-pvops b/buildconfigs/mk.linux-2.6-pvops index 002a247f74..904eb56f0a 100644 --- 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 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 $@ |