squashfs: add zstd support

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 70c0fc98084f4b38a63ca23a99cf5d2ad6cd8269..c16ebbf27f04ffda842bb9d61ebd87847c8866a2 100644 (file)
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -41,6 +41,12 @@ config BR2_PACKAGE_SQUASHFS_XZ
        help
          Support XZ compression algorithm
 
+config BR2_PACKAGE_SQUASHFS_ZSTD
+       bool "zstd support"
+       select BR2_PACKAGE_ZSTD
+       help
+         Support ZSTD compression algorithm
+
 endif
 
 comment "squashfs needs a toolchain w/ threads"

diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 67025ac68ae0573810064bbd3f0c397e2c8e89d0..7467342c486045180ee10acd7f299d5580fa4fa9 100644 (file)
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -9,7 +9,7 @@ SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
 SQUASHFS_SITE_METHOD = git
 SQUASHFS_LICENSE = GPL-2.0+
 SQUASHFS_LICENSE_FILES = COPYING
-SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0
+SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
 SQUASHFS_DEPENDENCIES += lz4
@@ -39,6 +39,13 @@ else
 SQUASHFS_MAKE_ARGS += LZO_SUPPORT=0
 endif
 
+ifeq ($(BR2_PACKAGE_SQUASHFS_ZSTD),y)
+SQUASHFS_DEPENDENCIES += zstd
+SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=1 COMP_DEFAULT=zstd
+else
+SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=0
+endif
+
 ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP),y)
 SQUASHFS_DEPENDENCIES += zlib
 SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=1 COMP_DEFAULT=gzip