[v3,3/6] squashfs: add host zstd support

Message ID 20180416193953.19924-3-ps.report@gmx.net
State Accepted
Headers show
Series
  • [v3,1/6] squashfs: add license hash
Related show

Commit Message

Peter Seiderer April 16, 2018, 7:39 p.m.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v2 -> v3:
  - no changes

Changes v1 -> v2:
  - split off host zstd support (suggested by Yann E. MORIN)
---
 package/squashfs/squashfs.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Yann E. MORIN April 23, 2018, 7:57 a.m. | #1
Peter, All,

On 2018-04-16 21:39 +0200, Peter Seiderer spake thusly:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> Changes v2 -> v3:
>   - no changes
> 
> Changes v1 -> v2:
>   - split off host zstd support (suggested by Yann E. MORIN)
> ---
>  package/squashfs/squashfs.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
> index e656218f97..67025ac68a 100644
> --- a/package/squashfs/squashfs.mk
> +++ b/package/squashfs/squashfs.mk
> @@ -46,7 +46,7 @@ else
>  SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
>  endif
>  
> -HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
> +HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd
>  
>  HOST_SQUASHFS_MAKE_ARGS = \
>  	XATTR_SUPPORT=1 \
> @@ -55,7 +55,7 @@ HOST_SQUASHFS_MAKE_ARGS = \
>  	LZ4_SUPPORT=1 \
>  	LZO_SUPPORT=1 \
>  	LZMA_XZ_SUPPORT=1 \
> -	ZSTD_SUPPORT=0
> +	ZSTD_SUPPORT=1
>  
>  define SQUASHFS_BUILD_CMDS
>  	$(TARGET_MAKE_ENV) $(MAKE) \
> -- 
> 2.16.3
>
Thomas Petazzoni April 25, 2018, 9:38 p.m. | #2
Hello,

On Mon, 16 Apr 2018 21:39:50 +0200, Peter Seiderer wrote:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v2 -> v3:
>   - no changes

I hate when we add unconditional dependencies to host packages, when
those dependencies are in fact optional. Long term, we really need to
find a better way of doing this.

In the mean time: applied, thanks!

Best regards,

Thomas

Patch

diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index e656218f97..67025ac68a 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -46,7 +46,7 @@  else
 SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
 endif
 
-HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
+HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd
 
 HOST_SQUASHFS_MAKE_ARGS = \
 	XATTR_SUPPORT=1 \
@@ -55,7 +55,7 @@  HOST_SQUASHFS_MAKE_ARGS = \
 	LZ4_SUPPORT=1 \
 	LZO_SUPPORT=1 \
 	LZMA_XZ_SUPPORT=1 \
-	ZSTD_SUPPORT=0
+	ZSTD_SUPPORT=1
 
 define SQUASHFS_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) \