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 v3 2/5] host-squashfs-tools: add support for zstd contitional
Date: Fri, 24 Jul 2020 17:51:00 +0200	[thread overview]
Message-ID: <20200724155103.6374-2-bruno.thomsen@gmail.com> (raw)
In-Reply-To: <20200724155103.6374-1-bruno.thomsen@gmail.com>

Only enable host zstd package dependency when needed,
so it doesn't build unnecessary packages.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 2:
Moved from 0003 to 0002.
Added HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT config.

Changes since version 1:
Removed all /usr/local paths changes in HOST_SQUASHFS_TOOLS_MAKE_ENV.
This looks cleaner :)

 rules/host-squashfs-tools.in   | 8 ++++++++
 rules/host-squashfs-tools.make | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
index 4ac2fa1b0..04de7d1fc 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 39a6d11e1..42b48b2c5 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"
-- 
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-24 15:51 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-24 15:50 [ptxdist] [PATCH v3 1/5] host-zstd: new package Bruno Thomsen
2020-07-24 15:51 ` Bruno Thomsen [this message]
2020-08-03  6:29   ` [ptxdist] [APPLIED] host-squashfs-tools: add support for zstd contitional Michael Olbrich
2020-07-24 15:51 ` [ptxdist] [PATCH v3 3/5] image-root-squashfs: add zstd compression option Bruno Thomsen
2020-08-03  6:30   ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-24 15:51 ` [ptxdist] [PATCH v3 4/5] host-squashfs-tools: conditional select lzo and xz dependencies Bruno Thomsen
2020-08-03  6:30   ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-24 15:51 ` [ptxdist] [PATCH v3 5/5] host-squashfs-tools: fix lz4 compression option Bruno Thomsen
2020-08-03  6:30   ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-03  6:29 ` [ptxdist] [APPLIED] host-zstd: new package 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=20200724155103.6374-2-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