tools/squashfs4: backport OpenWrt extended options patch

Due to us keeping a patch around for years and never proposing it to squashfs4 repository, we resulted in having the same squashfs4 version but with different supported options. (openwrt patched -- upstream) To workaround this problem, a non-standard option was required. To not have surprise on tool bump, backport the patch and add the new config option required to enable these extended non-standard options. Signed-off-by: Christian Marangi <[email protected]>
RookieMS · Apr 20, 2023 · c7c3208 · c7c3208
1 parent a247f49
commit c7c3208
Show file tree

Hide file tree

Showing 3 changed files with 900 additions and 1 deletion.
diff --git a/tools/squashfs4/Makefile b/tools/squashfs4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=squashfs4
 PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
 PKG_VERSION:=4.6.1
-PKG_RELEASE=2
+PKG_RELEASE=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools
@@ -26,6 +26,7 @@ define Host/Compile
  $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/squashfs-tools \
  XZ_SUPPORT=1 \
  LZMA_XZ_SUPPORT=1 \
+ XZ_EXTENDED_OPTIONS=1 \
  EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \
  mksquashfs unsquashfs
 endef

diff --git a/...t-multiple-lzma-configuration-optio.patch → ...t-multiple-lzma-configuration-optio.patch b/...t-multiple-lzma-configuration-optio.patch → ...t-multiple-lzma-configuration-optio.patch