diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-04 12:16:37 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-04 12:16:37 +0100 |
| commit | 2096682555be17947092e7129fb0052655ac74ea (patch) | |
| tree | 85953cfc035f4d2848cfc086544b86334ad33908 /buildconfigs | |
| parent | 7203b89c15311d9a8bb7d6d645403170ce009b6c (diff) | |
| download | xen-2096682555be17947092e7129fb0052655ac74ea.tar.gz xen-2096682555be17947092e7129fb0052655ac74ea.tar.bz2 xen-2096682555be17947092e7129fb0052655ac74ea.zip | |
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@citrix.com>
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/src.git-clone | 7 |
1 files changed, 3 insertions, 4 deletions
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 $@ |