Re: [ptxdist] [APPLIED] host-squashfs-tools: add support for zstd contitional

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as 858f11d021da21819dc3a069e1b38b8cec91f0c6.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:29:59 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Only enable host zstd package dependency when needed,
> so it doesn't build unnecessary packages.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200724155103.6374-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
> index 4ac2fa1b0cbf..04de7d1fcf05 100644
> --- a/rules/host-squashfs-tools.in
> +++ b/rules/host-squashfs-tools.in
> @@ -5,4 +5,12 @@ config HOST_SQUASHFS_TOOLS
>  	select HOST_ZLIB
>  	select HOST_LIBLZO
>  	select HOST_XZ
> +	select HOST_ZSTD	if HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT
>  	default y if ALLYES
> +
> +if HOST_SQUASHFS_TOOLS
> +
> +config HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT
> +	bool
> +
> +endif
> diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
> index 39a6d11e18a9..42b48b2c5273 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -21,7 +21,11 @@ HOST_SQUASHFS_TOOLS_SUBDIR	:= squashfs-tools
>  # Compile
>  # ----------------------------------------------------------------------------
>  
> -HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
> +HOST_SQUASHFS_TOOLS_MAKE_OPT := \
> +	LZO_SUPPORT=1 \
> +	XZ_SUPPORT=1 \
> +	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"
>  HOST_SQUASHFS_TOOLS_MAKE_PAR := NO
>  HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/sbin"

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