Re: [Xen-devel] [PATCH for 4.6] build: fix tarball stubdom build

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 27.08.15 at 17:54, <wei.liu2@xxxxxxxxxx> wrote:
> When we create a source code tarball, mini-os is extracted to
> extras/mini-os directory. When building a source code tarball, we
> shouldn't clone mini-os again.
> 
> Only clone mini-os when that directory doesn't exist. This fixes tarball
> build and doesn't affect non-tarball build.
> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> ---
>  Makefile | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index e8a75ff..ba0df70 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -19,10 +19,12 @@ include Config.mk
>  
>  .PHONY: mini-os-dir
>  mini-os-dir:
> -     GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \
> -             $(MINIOS_UPSTREAM_URL) \
> -             $(MINIOS_UPSTREAM_REVISION) \
> -             $(XEN_ROOT)/extras/mini-os
> +     if [ ! -d $(XEN_ROOT)/extras/mini-os ]; then \
> +             GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \
> +                     $(MINIOS_UPSTREAM_URL) \
> +                     $(MINIOS_UPSTREAM_REVISION) \
> +                     $(XEN_ROOT)/extras/mini-os ; \
> +     fi

Wouldn't his better be done (avoiding the need for the shell
conditional) by simply renaming the make target from
mini-os-dir to extras/mini-os (and dropping the .PHONY)?

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel