[ptxdist] [PATCH v3 4/5] host-squashfs-tools: conditional select lzo and xz dependencies

[Bruno Thomsen <bruno.thomsen@gmail.com>]

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>
---
Changes since version 2:
Select HOST_SQUASHFS_TOOLS_LZO_SUPPORT config.
Select HOST_SQUASHFS_TOOLS_XZ_SUPPORT config.
Added HOST_SQUASHFS_TOOLS_LZO_SUPPORT config.
Added HOST_SQUASHFS_TOOLS_XZ_SUPPORT config.

No changes since version 1.

 platforms/image-root-squashfs.in |  2 ++
 rules/host-squashfs-tools.in     | 10 ++++++++--
 rules/host-squashfs-tools.make   |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/platforms/image-root-squashfs.in b/platforms/image-root-squashfs.in
index 98aae9c1c..a6d1d1b44 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 04de7d1fc..3ba693aaf 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 42b48b2c5..f34efb50f 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"
-- 
2.26.2


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