From 2096682555be17947092e7129fb0052655ac74ea Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 4 May 2010 12:16:37 +0100 Subject: 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 --- buildconfigs/src.git-clone | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'buildconfigs') diff --git a/buildconfigs/src.git-clone b/buildconfigs/src.git-clone index b871202689..cc918e7408 100644 --- a/buildconfigs/src.git-clone +++ b/buildconfigs/src.git-clone @@ -23,9 +23,8 @@ $(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 $(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 $@ -- cgit v1.2.3