diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-08-13 08:48:08 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-08-13 08:48:08 +0100 |
| commit | f29344c09166780b907af352d438666caba602af (patch) | |
| tree | f3eba6284b3cf9589fb0e6e1d8fde0de40f9e553 | |
| parent | 82c6982d50a89a709a0c3ecf0f63dc5c572849ed (diff) | |
| download | xen-f29344c09166780b907af352d438666caba602af.tar.gz xen-f29344c09166780b907af352d438666caba602af.tar.bz2 xen-f29344c09166780b907af352d438666caba602af.zip | |
Update git pull machinery
This is needed to pull a non-default branch, and to allow the test
infrastructure's bisection machinery to work.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| -rw-r--r-- | buildconfigs/src.git-clone | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/buildconfigs/src.git-clone b/buildconfigs/src.git-clone index b871202689..35865e1f1f 100644 --- a/buildconfigs/src.git-clone +++ b/buildconfigs/src.git-clone @@ -13,19 +13,20 @@ ifeq ($(XEN_LINUX_GIT_REMOTEBRANCH),) .ERROR: XEN_LINUX_GIT_REMOTEBRANCH not specified endif -XEN_LINUX_GIT_LOCALBRANCH ?= master +XEN_GIT_ORIGIN ?= xen + +XEN_LINUX_GIT_LOCALBRANCH ?= $(XEN_LINUX_GIT_REMOTEBRANCH) # Set XEN_LINUX_GITREV to update to a particlar revision. -XEN_LINUX_GITREV ?= +XEN_LINUX_GITREV ?= $(XEN_GIT_ORIGIN)/$(XEN_LINUX_GIT_REMOTEBRANCH) $(LINUX_SRCDIR)/.valid-src: $(__XEN_LINUX_UPDATE) set -ex; \ if ! [ -d $(LINUX_SRCDIR) ]; then \ rm -rf $(LINUX_SRCDIR) $(LINUX_SRCDIR).tmp; \ mkdir $(LINUX_SRCDIR).tmp; rmdir $(LINUX_SRCDIR).tmp; \ - $(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); \ + $(GIT) clone -o $(XEN_GIT_ORIGIN) -n $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \ + (cd $(LINUX_SRCDIR).tmp; git checkout -b $(XEN_LINUX_GIT_LOCALBRANCH) $(XEN_LINUX_GITREV) ); \ + mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \ fi touch $@ |