[CRIU] [PATCH] soccr: Generate config.h dynamically

Dmitry Safonov dsafonov at virtuozzo.com
Wed Oct 5 06:28:57 PDT 2016


Hi,
I'm ok with this, but:

On 10/05/2016 04:25 PM, Cyrill Gorcunov wrote:
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  Makefile       | 3 +++
>  soccr/config.h | 2 +-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index c15132e0cf31..95c849515798 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -209,6 +209,8 @@ include Makefile.compel
>  # Next the socket CR library
>  #
>  SOCCR_A := soccr/libsoccr.a
> +soccr/config.h: $(CONFIG_HEADER)
> +	$(Q) ln -s $(CONFIG_HEADER) $@
>  soccr/%: $(CONFIG_HEADER) .FORCE
>  	$(Q) $(MAKE) $(build)=soccr $@

You need to change deps here for $(CONFIG_HEADER) => soccr/config.h

>  soccr/built-in.o: $(CONFIG_HEADER) .FORCE

Here too and maybe at some other places.

> @@ -266,6 +268,7 @@ mrproper: subclean
>  	$(Q) $(MAKE) $(build)=compel/plugins $@
>  	$(Q) $(MAKE) $(build)=soccr $@
>  	$(Q) $(RM) $(CONFIG_HEADER)
> +	$(Q) $(RM) soccr/config.h
>  	$(Q) $(RM) $(VERSION_HEADER)
>  	$(Q) $(RM) $(COMPEL_VERSION_HEADER)
>  	$(Q) $(RM) cscope.*
> diff --git a/soccr/config.h b/soccr/config.h
> index 106aa8bf2be0..6d527597990a 120000
> --- a/soccr/config.h
> +++ b/soccr/config.h
> @@ -1 +1 @@
> -../criu/include/config.h
> \ No newline at end of file
> +/home/criu/criu/include/config.h
> \ No newline at end of file
>


-- 
              Dmitry


More information about the CRIU mailing list