Skip to contentSkip to conversation

squashfs: do not force gzip support if lz4/xz/zstd is selected

PATCH New Peter Korsgaard 2 participants 4 messages Dec 7, 2018 – Dec 16, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 squashfs: do not force gzip support if lz4/xz/zstd is selected

The logic to ensure at least one compression backend is selected was not updated when lz4, xz and zstd were introduced - Fix that.

---
 package/squashfs/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/squashfs/Config.in +6 -1
index c16ebbf27f..fdd8833060 100644
@@ -2,7 +2,12 @@ config BR2_PACKAGE_SQUASHFS
 	bool "squashfs"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
+	select BR2_PACKAGE_SQUASHFS_GZIP if !( \
+	       BR2_PACKAGE_SQUASHFS_LZ4 || \
+	       BR2_PACKAGE_SQUASHFS_LZMA || \
+	       BR2_PACKAGE_SQUASHFS_LZO || \
+	       BR2_PACKAGE_SQUASHFS_XZ || \
+	       BR2_PACKAGE_SQUASHFS_ZSTD)
 	help
 	  Tools to generate SquashFS filesystems.
 
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 squashfs: do not force gzip support if lz4/xz/zstd is selected

Hello Peter,

Quoted 13 lines · Peter Korsgaard

The logic to ensure at least one compression backend is selected was not updated when lz4, xz and zstd were introduced - Fix that.

---
 package/squashfs/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/squashfs/Config.in +0 -0
index c16ebbf27f..fdd8833060 100644

package/squashfs/Config.in config BR2_PACKAGE_SQUASHFS · line 4

Quoted 3 lines
package/squashfs/Config.in +0 -0
@@ -2,7 +2,12 @@ config BR2_PACKAGE_SQUASHFS
 	bool "squashfs"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()

Nitpick: maybe a short comment here is helpful (I missed the line while adding zstd support)?

  # ensure at least on compression backend (defaults to gzip)

package/squashfs/Config.in config BR2_PACKAGE_SQUASHFS · line 13

Quoted 10 lines
package/squashfs/Config.in +6 -1
-	select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
+	select BR2_PACKAGE_SQUASHFS_GZIP if !( \
+	       BR2_PACKAGE_SQUASHFS_LZ4 || \
+	       BR2_PACKAGE_SQUASHFS_LZMA || \
+	       BR2_PACKAGE_SQUASHFS_LZO || \
+	       BR2_PACKAGE_SQUASHFS_XZ || \
+	       BR2_PACKAGE_SQUASHFS_ZSTD)
 	help
 	  Tools to generate SquashFS filesystems.
 

Regards,
Peter

#2 lore raw

PATCH 1/1 squashfs: do not force gzip support if lz4/xz/zstd is selected

Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Hello Peter,

Quoted 13 lines · Peter Korsgaard

The logic to ensure at least one compression backend is selected was not updated when lz4, xz and zstd were introduced - Fix that.

---
package/squashfs/Config.in | 7 ++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
package/squashfs/Config.in +0 -0
index c16ebbf27f..fdd8833060 100644
@@ -2,7 +2,12 @@ config BR2_PACKAGE_SQUASHFS
Quoted 3 lines

bool "squashfs"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()

Nitpick: maybe a short comment here is helpful (I missed the line while adding zstd support)?

Quoted 1 line
  # ensure at least on compression backend (defaults to gzip)

Committed after adding this comment, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 squashfs: do not force gzip support if lz4/xz/zstd is selected

In reply to Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

The logic to ensure at least one compression backend is selected was not updated when lz4, xz and zstd were introduced - Fix that.

Committed to 2018.02.x, 2018.08.x and 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard