[Xen-changelog] [xen-unstable] Honour XEN_LINUX_GIT_LOCALBRANCH and XEN_LINUX_GITREV variables

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273650227 -3600
# Node ID 15e574a858000a721d962a6f3152ab561f11f5c1
# Parent  e50afc6ecc4833f07fce3cd57a5a8bae6ea41125
Honour XEN_LINUX_GIT_LOCALBRANCH and XEN_LINUX_GITREV variables

XEN_GIT_ORIGIN to set the name of the remote origin; the default is
still "xen".

XEN_LINUX_GIT_LOCALBRANCH allows the name of the local branch to be
set.  The default is the same as the remote branch.

XEN_LINUX_GITREV allows a specific GIT revision to be checked out,
rather than a branch.  By default it is the remote branch name.

This change should result in no change in behaviour in the normal
case.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
 buildconfigs/src.git-clone |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff -r e50afc6ecc48 -r 15e574a85800 buildconfigs/src.git-clone
--- a/buildconfigs/src.git-clone        Wed May 12 08:42:30 2010 +0100
+++ b/buildconfigs/src.git-clone        Wed May 12 08:43:47 2010 +0100
@@ -13,18 +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 -o xen -n $(XEN_LINUX_GIT_URL) 
$(LINUX_SRCDIR).tmp; \
-               (cd $(LINUX_SRCDIR).tmp; git checkout -b 
$(XEN_LINUX_GIT_REMOTEBRANCH) xen/$(XEN_LINUX_GIT_REMOTEBRANCH) ); \
+               $(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 $@

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