[ptxdist] [PATCH] squashfs-tools: add zstd compression support

[ptxdist] [PATCH] squashfs-tools: add zstd compression support

[Bruno Thomsen]

ZSTD_LIBZSTD is needed runtime and ZSTD is needed compile
time. Kconfig options has been separated into build and
install options, so it's easier to extend with more e.g.
compression types.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/squashfs-tools.in   | 10 ++++++++++
 rules/squashfs-tools.make |  1 +
 2 files changed, 11 insertions(+)

diff --git a/rules/squashfs-tools.in b/rules/squashfs-tools.in
index a90153ae1..9e4f48550 100644
--- a/rules/squashfs-tools.in
+++ b/rules/squashfs-tools.in
@@ -6,6 +6,8 @@ menuconfig SQUASHFS_TOOLS
 	select LIBC_PTHREAD
 	select GCCLIBS_GCC_S
 	select ZLIB
+	select ZSTD		if SQUASHFS_TOOLS_ZSTD_SUPPORT
+	select ZSTD_LIBZSTD	if SQUASHFS_TOOLS_ZSTD_SUPPORT
 	prompt "squashfs-tools                "
 	help
 	  Squashfs is a highly compressed read-only filesystem for Linux.
@@ -16,6 +18,14 @@ menuconfig SQUASHFS_TOOLS
 
 if SQUASHFS_TOOLS
 
+comment "build options"
+
+config SQUASHFS_TOOLS_ZSTD_SUPPORT
+	bool
+	prompt "Support Zstandard (zstd) compression"
+
+comment "install options"
+
 config SQUASHFS_TOOLS_MKSQUASHFS
 	bool
 	prompt "Install mksquashfs"
diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
index 6afd44ddf..4b9581883 100644
--- a/rules/squashfs-tools.make
+++ b/rules/squashfs-tools.make
@@ -30,6 +30,7 @@ SQUASHFS_TOOLS_LICENSE	:= GPL-2.0-or-later
 
 SQUASHFS_TOOLS_MAKE_PAR := NO
 SQUASHFS_TOOLS_MAKE_ENV := \
+	ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) \
 	$(CROSS_ENV)
 
 SQUASHFS_TOOLS_INSTALL_OPT := \

base-commit: 9fe5462616de2ce93663f409f471ea83a6d5fbb5
-- 
2.26.2


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

Re: [ptxdist] [APPLIED] squashfs-tools: add zstd compression support

[Michael Olbrich]

Thanks, applied as e37db9dbf300a5921055a47748291dcc580feca0.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:09 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> ZSTD_LIBZSTD is needed runtime and ZSTD is needed compile
> time. Kconfig options has been separated into build and
> install options, so it's easier to extend with more e.g.
> compression types.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200716172133.4351-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/squashfs-tools.in b/rules/squashfs-tools.in
> index a90153ae13fb..9e4f48550c1b 100644
> --- a/rules/squashfs-tools.in
> +++ b/rules/squashfs-tools.in
> @@ -6,6 +6,8 @@ menuconfig SQUASHFS_TOOLS
>  	select LIBC_PTHREAD
>  	select GCCLIBS_GCC_S
>  	select ZLIB
> +	select ZSTD		if SQUASHFS_TOOLS_ZSTD_SUPPORT
> +	select ZSTD_LIBZSTD	if SQUASHFS_TOOLS_ZSTD_SUPPORT
>  	prompt "squashfs-tools                "
>  	help
>  	  Squashfs is a highly compressed read-only filesystem for Linux.
> @@ -16,6 +18,14 @@ menuconfig SQUASHFS_TOOLS
>  
>  if SQUASHFS_TOOLS
>  
> +comment "build options"
> +
> +config SQUASHFS_TOOLS_ZSTD_SUPPORT
> +	bool
> +	prompt "Support Zstandard (zstd) compression"
> +
> +comment "install options"
> +
>  config SQUASHFS_TOOLS_MKSQUASHFS
>  	bool
>  	prompt "Install mksquashfs"
> diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
> index 6afd44ddf897..4b9581883979 100644
> --- a/rules/squashfs-tools.make
> +++ b/rules/squashfs-tools.make
> @@ -30,6 +30,7 @@ SQUASHFS_TOOLS_LICENSE	:= GPL-2.0-or-later
>  
>  SQUASHFS_TOOLS_MAKE_PAR := NO
>  SQUASHFS_TOOLS_MAKE_ENV := \
> +	ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) \
>  	$(CROSS_ENV)
>  
>  SQUASHFS_TOOLS_INSTALL_OPT := \

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