Jeremy Fitzhardinge
2010-Apr-29 20:49 UTC
[Xen-devel] 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>
diff -r 9a1d7caa2024 buildconfigs/src.git-clone
--- a/buildconfigs/src.git-clone Mon Apr 26 12:13:23 2010 +0100
+++ b/buildconfigs/src.git-clone Thu Apr 29 13:37:30 2010 -0700
@@ -23,9 +23,8 @@
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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel