mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Introduce git-checkout.sh
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Introduce a script to perform git checkout on an external git tree; use git-checkout.sh in ioemu-dir-find. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com>
This commit is contained in:
committed
1 parent
b3b15b7611
commit
aec0a31ffe
3 files changed
+32
-17
No files matched your search
@@ -296,7 +296,7 @@
|
||||
^tools/xm-test/lib/XmTestLib/config.py$
|
||||
^tools/xm-test/lib/XmTestReport/xmtest.py$
|
||||
^tools/xm-test/tests/.*\.test$
|
||||
^tools/ioemu-remote
|
||||
^tools/ioemu-dir-remote
|
||||
^tools/ioemu-dir$
|
||||
^tools/ocaml/.*/.*\.annot$
|
||||
^tools/ocaml/.*/.*\.cmx?a$
|
||||
|
||||
Executable
+27
@@ -0,0 +1,27 @@
|
||||
#!/bin/sh
|
||||
|
||||
if test $# -lt 3; then
|
||||
echo "Usage: $0 <tree> <tag> <dir>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TREE=$1
|
||||
TAG=$2
|
||||
DIR=$3
|
||||
|
||||
set -e
|
||||
|
||||
if test \! -d $DIR-remote; then
|
||||
rm -rf $DIR-remote $DIR-remote.tmp
|
||||
mkdir $DIR-remote.tmp; rmdir $DIR-remote.tmp
|
||||
$GIT clone $TREE $DIR-remote.tmp
|
||||
if test "$TAG" ; then
|
||||
cd $DIR-remote.tmp
|
||||
$GIT branch -D dummy >/dev/null 2>&1 ||:
|
||||
$GIT checkout -b dummy $TAG
|
||||
cd ..
|
||||
fi
|
||||
mv $DIR-remote.tmp $DIR-remote
|
||||
fi
|
||||
rm -f $DIR
|
||||
ln -sf $DIR-remote $DIR
|
||||
+4
-16
@@ -75,7 +75,7 @@ clean: subdirs-clean
|
||||
|
||||
.PHONY: distclean
|
||||
distclean: subdirs-distclean
|
||||
rm -rf ioemu-dir ioemu-remote
|
||||
rm -rf ioemu-dir ioemu-dir-remote
|
||||
|
||||
ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
|
||||
IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
|
||||
@@ -93,20 +93,8 @@ ioemu-dir-find:
|
||||
if test -d $(CONFIG_QEMU); then \
|
||||
mkdir -p ioemu-dir; \
|
||||
else \
|
||||
if [ ! -d ioemu-remote ]; then \
|
||||
rm -rf ioemu-remote ioemu-remote.tmp; \
|
||||
mkdir ioemu-remote.tmp; rmdir ioemu-remote.tmp; \
|
||||
$(GIT) clone $(CONFIG_QEMU) ioemu-remote.tmp; \
|
||||
if [ "$(QEMU_TAG)" ]; then \
|
||||
cd ioemu-remote.tmp; \
|
||||
$(GIT) branch -D dummy >/dev/null 2>&1 ||:; \
|
||||
$(GIT) checkout -b dummy $(QEMU_TAG); \
|
||||
cd ..; \
|
||||
fi; \
|
||||
mv ioemu-remote.tmp ioemu-remote; \
|
||||
fi; \
|
||||
rm -f ioemu-dir; \
|
||||
ln -sf ioemu-remote ioemu-dir; \
|
||||
export GIT=$(GIT); \
|
||||
$(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) ioemu-dir; \
|
||||
fi
|
||||
set -e; \
|
||||
$(buildmakevars2shellvars); \
|
||||
@@ -117,7 +105,7 @@ ioemu-dir-find:
|
||||
ioemu-dir-force-update:
|
||||
set -ex; \
|
||||
if [ "$(QEMU_TAG)" ]; then \
|
||||
cd ioemu-remote; \
|
||||
cd ioemu-dir-remote; \
|
||||
$(GIT) fetch origin; \
|
||||
$(GIT) reset --hard $(QEMU_TAG); \
|
||||
fi
|
||||
|
||||