Re: [Xen-devel] [PATCH v9 1/6] Introduce git-checkout.sh

[Christoph Egger <Christoph.Egger@xxxxxxx>]

On 11/23/11 14:51, stefano.stabellini@xxxxxxxxxxxxx wrote:
> From: stefano.stabellini@xxxxxxxxxxxxx<stefano.stabellini@xxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxx>
[...]

> diff --git a/tools/Makefile b/tools/Makefile
> index 9389e1f..beccad2 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -71,7 +71,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) \
> @@ -89,20 +89,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; \
When you use $(SHELL) then we do not need to care about the execute bit:

+		$(SHELL) $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) 
$(QEMU_TAG) ioemu-dir; \

Christoph


>         fi
>         set -e; \
>                 $(buildmakevars2shellvars); \
> @@ -113,7 +101,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

--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632


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