WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-4.0-testing] Update git pull machinery

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-4.0-testing] Update git pull machinery
From: "Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 25 Aug 2010 01:30:17 -0700
Delivery-date: Wed, 25 Aug 2010 01:30:32 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1281685688 -3600
# Node ID b8d3694daa2d9c6d47841762e8b92851814ffea3
# Parent  8e8dd38374e9758412b079bf2edda1909ef157dd
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@xxxxxxxxxx>
---
 buildconfigs/src.git-clone |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff -r 8e8dd38374e9 -r b8d3694daa2d buildconfigs/src.git-clone
--- a/buildconfigs/src.git-clone        Wed Aug 11 16:44:03 2010 +0100
+++ b/buildconfigs/src.git-clone        Fri Aug 13 08:48:08 2010 +0100
@@ -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 $@

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-4.0-testing] Update git pull machinery, Xen patchbot-4.0-testing <=