mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Bruno Thomsen <bruno.thomsen@gmail.com>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>, bth@kamstrup.com
Subject: [ptxdist] [PATCH] squashfs-tools: add zstd compression support
Date: Thu, 16 Jul 2020 19:21:33 +0200	[thread overview]
Message-ID: <20200716172133.4351-1-bruno.thomsen@gmail.com> (raw)

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

             reply	other threads:[~2020-07-16 17:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-16 17:21 Bruno Thomsen [this message]
2020-07-17 11:57 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200716172133.4351-1-bruno.thomsen@gmail.com \
    --to=bruno.thomsen@gmail.com \
    --cc=bth@kamstrup.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox