[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen-unstable] Make sure git clone gets the right kernel branch



# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1272971797 -3600
# Node ID b0fb42ff7afd8651c238ac8d55155dd30c40dc0f
# Parent  cb06a3e1ee57e106dd43f8a1904e2e56bb66290c
Make sure git clone gets the right kernel branch

When cloning kernel repo:
  1. make remote called "xen" rather than the default "origin"
  2. directly checkout the desired branch, rather than the default
  then the desired one

Git 1.5 doesn't support -b on git clone, and seems to do something odd
with the checkout branch argument, so avoid using the newer
commandline options.

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

diff -r cb06a3e1ee57 -r b0fb42ff7afd buildconfigs/src.git-clone
--- a/buildconfigs/src.git-clone        Tue May 04 12:15:28 2010 +0100
+++ b/buildconfigs/src.git-clone        Tue May 04 12:16:37 2010 +0100
@@ -23,9 +23,8 @@ XEN_LINUX_GITREV  ?=
        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 -n $(XEN_LINUX_GIT_URL) 
$(LINUX_SRCDIR).tmp; \
+               (cd $(LINUX_SRCDIR).tmp; git checkout -b 
$(XEN_LINUX_GIT_REMOTEBRANCH) xen/$(XEN_LINUX_GIT_REMOTEBRANCH) ); \
+               mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
        fi
        touch $@

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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.