Re: [Xen-devel] [PATCH 01/12] Config.mk: move directory list into BUILD_MAKE_VARS

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2014-04-24 at 10:36 +0200, Olaf Hering wrote:
> To maintain the list of directories in a single place, move the existing
> list into its own variable and use it in buildmakevars2file.
> Required for upcoming changes.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

You haven't really CCd the right people though, this is not strictly
just a tools change. Apart from the path of the file being touched the
make function in question is also used by the stubdom stuff.

Probably doesn't matter for this particular patch, but I fear it might
for the upcoming changes you refer to. Did you test a stubdom build with
them?

> ---
>  Config.mk | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/Config.mk b/Config.mk
> index 6a93533..a26e964 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -166,15 +166,17 @@ define move-if-changed
>       if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi
>  endef
>  
> +BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBDIR SHAREDIR PRIVATE_BINDIR \
> +                   XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR 
> \
> +                   XEN_RUN_DIR XEN_PAGING_DIR
> +
>  buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
>  define buildmakevars2file-closure
>      .PHONY: genpath
>      genpath:
>       rm -f $(1).tmp;                                                     \
>       $(foreach var,                                                      \
> -               SBINDIR BINDIR LIBEXEC LIBDIR SHAREDIR PRIVATE_BINDIR     \
> -               XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
> -               XEN_RUN_DIR XEN_PAGING_DIR,                               \
> +               $(BUILD_MAKE_VARS),                                       \

I think this can now go on the same line as the foreach. Possibly the
whole thing might fit on one line now too?

>                 echo "$(var)=\"$($(var))\"" >>$(1).tmp;)        \
>       $(call move-if-changed,$(1).tmp,$(1))
>  endef



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