Re: [ptxdist] [APPLIED] host-squashfs-tools: conditional select lzo and xz dependencies

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as c6aae0220ea911420adc14bd6feb406e69790f5c.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:00 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Only select host lzo and host xz packages when needed to
> speed up complete build time and avoid unnecessary dependencies.
> Update image-root-squashfs Kconfig dependency selection.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200724155103.6374-4-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/image-root-squashfs.in b/platforms/image-root-squashfs.in
> index 98aae9c1c089..a6d1d1b445e9 100644
> --- a/platforms/image-root-squashfs.in
> +++ b/platforms/image-root-squashfs.in
> @@ -4,6 +4,8 @@ menuconfig IMAGE_ROOT_SQUASHFS
>  	tristate
>  	select HOST_GENIMAGE
>  	select HOST_SQUASHFS_TOOLS
> +	select HOST_SQUASHFS_TOOLS_LZO_SUPPORT	if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO
> +	select HOST_SQUASHFS_TOOLS_XZ_SUPPORT	if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ
>  	select HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT	if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
>  	select IMAGE_ROOT_TGZ
>  	prompt "Generate images/root.squashfs "
> diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
> index 04de7d1fcf05..3ba693aaf7a4 100644
> --- a/rules/host-squashfs-tools.in
> +++ b/rules/host-squashfs-tools.in
> @@ -3,13 +3,19 @@
>  config HOST_SQUASHFS_TOOLS
>  	tristate
>  	select HOST_ZLIB
> -	select HOST_LIBLZO
> -	select HOST_XZ
> +	select HOST_LIBLZO	if HOST_SQUASHFS_TOOLS_LZO_SUPPORT
> +	select HOST_XZ		if HOST_SQUASHFS_TOOLS_XZ_SUPPORT
>  	select HOST_ZSTD	if HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT
>  	default y if ALLYES
>  
>  if HOST_SQUASHFS_TOOLS
>  
> +config HOST_SQUASHFS_TOOLS_LZO_SUPPORT
> +	bool
> +
> +config HOST_SQUASHFS_TOOLS_XZ_SUPPORT
> +	bool
> +
>  config HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT
>  	bool
>  
> diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
> index 42b48b2c5273..f34efb50f65e 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -22,8 +22,8 @@ HOST_SQUASHFS_TOOLS_SUBDIR	:= squashfs-tools
>  # ----------------------------------------------------------------------------
>  
>  HOST_SQUASHFS_TOOLS_MAKE_OPT := \
> -	LZO_SUPPORT=1 \
> -	XZ_SUPPORT=1 \
> +	LZO_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_LZO_SUPPORT,1,0) \
> +	XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_XZ_SUPPORT,1,0) \
>  	ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0)
>  
>  HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de