tools/squashfs: rename to squashfs3-lzma

The name of squashfs is confusing since in reality it's a really old
version using an old lzma library. This tools is used for old ath79
netgear target and to produde a fake squasfs3 image needed for some
specific bootloader from some OEM (AVM for example)

Rename squashfs tool to squasfs3-lzma to better describe it.
Rename the installed bin from mksquashfs-lzma to mksquashfs3-lzma.
Use tar transform to migrate the root directory in tar to the new
naming.
Drop redundant PKG_CAT variable not needed anymore.
Also update any user of this tool.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 70055cc576485f706636bedb2c2601631927801c..47d9d1ab8886b7a0669863531a17fac45a5b7ba7 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -106,7 +106,7 @@ endef
 define Build/append-squashfs-fakeroot-be
        rm -rf $@.fakefs $@.fakesquashfs
        mkdir $@.fakefs
-       $(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
+       $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma \
                $@.fakefs $@.fakesquashfs \
                -noappend -root-owned -be -nopad -b 65536 \
                $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))

diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk
index 5a61caf1f6424931361e2fc28ce0dd6aeecac8b6..c3b20cf1dc9731fc3c9a4051099f451f8b69ddc9 100644 (file)
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -12,7 +12,7 @@ define Build/netgear-squashfs
        rm -rf $@.fs $@.squashfs
        mkdir -p $@.fs/image
        cp $@ $@.fs/image/uImage
-       $(STAGING_DIR_HOST)/bin/mksquashfs-lzma  \
+       $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma  \
                $@.fs $@.squashfs -be \
                -noappend -root-owned -b 65536 \
                $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))

diff --git a/tools/Makefile b/tools/Makefile
index 7b3a8eb1425cbccb573dfd78762ff499b075ee8e..aa80ee4ba65918d43af55c211ab10ccd4e38b96f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -71,7 +71,7 @@ tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_LZ4_TOOLS),y) += lz4
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_LZO_TOOLS),y) += lzop
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_TOOLCHAIN),y) += gmp mpc mpfr
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini),y) += genext2fs
-tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old squashfs
+tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old squashfs3-lzma
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_mxs),y) += elftosb sdimage
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_realtek),y) += 7z
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_tegra),y) += cbootimage cbootimage-configs
@@ -116,7 +116,7 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile
 $(curdir)/pkgconf/compile := $(curdir)/meson/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile
 $(curdir)/sdcc/compile := $(curdir)/bison/compile
-$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
+$(curdir)/squashfs3-lzma/compile := $(curdir)/lzma-old/compile
 $(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/zstd/compile := $(curdir)/meson/compile
 

diff --git a/tools/squashfs/Makefile b/tools/squashfs3-lzma/Makefile
similarity index 60%
rename from tools/squashfs/Makefile
rename to tools/squashfs3-lzma/Makefile
index 385cf69d9d795d4bc3182c40cb728ae55c716632..b02018629ee3c900e14dd42c6e1dc521c0d2bd61 100644 (file)
--- a/tools/squashfs/Makefile
+++ b/tools/squashfs3-lzma/Makefile
@@ -6,16 +6,21 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=squashfs
+PKG_NAME:=squashfs3-lzma
 PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
 PKG_VERSION:=3.0
 
-PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.gz
+PKG_SOURCE:=squashfs$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/squashfs
 PKG_HASH:=39dbda43cf118536deb746c7730b468702d514a19f4cfab73b710e32908ddf20
-PKG_CAT:=zcat
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
+# Tar directory is squashfs3.0 that conflict with any pattern
+# currently using for host tools. (PKG_NAME-PKG_VERSION)
+# Also this got renamed to a more correct name
+# from squashfs to squashfs3-lzma.
+# Use tar transform to rename the root directory to this new
+# name.
+TAR_OPTIONS+=--transform=s/^squashfs/$(PKG_NAME)-/
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -29,13 +34,13 @@ define Host/Compile
 endef
 
 define Host/Install
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/unsquashfs3-lzma
 endef
 
 define Host/Clean
-       rm -f $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
-       rm -f $(STAGING_DIR_HOST)/bin/unsquashfs-lzma
+       rm -f $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma
+       rm -f $(STAGING_DIR_HOST)/bin/unsquashfs3-lzma
 endef
 
 $(eval $(call HostBuild))

diff --git a/tools/squashfs/patches/100-lzma.patch b/tools/squashfs3-lzma/patches/100-lzma.patch
similarity index 100%
rename from tools/squashfs/patches/100-lzma.patch
rename to tools/squashfs3-lzma/patches/100-lzma.patch

diff --git a/tools/squashfs/patches/110-no_nonstatic_inline.patch b/tools/squashfs3-lzma/patches/110-no_nonstatic_inline.patch
similarity index 100%
rename from tools/squashfs/patches/110-no_nonstatic_inline.patch
rename to tools/squashfs3-lzma/patches/110-no_nonstatic_inline.patch

diff --git a/tools/squashfs/patches/120-add-fixed-timestamp-support.patch b/tools/squashfs3-lzma/patches/120-add-fixed-timestamp-support.patch
similarity index 100%
rename from tools/squashfs/patches/120-add-fixed-timestamp-support.patch
rename to tools/squashfs3-lzma/patches/120-add-fixed-timestamp-support.patch

diff --git a/tools/squashfs/patches/130-include_sysmacros.patch b/tools/squashfs3-lzma/patches/130-include_sysmacros.patch
similarity index 100%
rename from tools/squashfs/patches/130-include_sysmacros.patch
rename to tools/squashfs3-lzma/patches/130-include_sysmacros.patch

diff --git a/tools/squashfs/patches/140-gcc-10-fix.patch b/tools/squashfs3-lzma/patches/140-gcc-10-fix.patch
similarity index 100%
rename from tools/squashfs/patches/140-gcc-10-fix.patch
rename to tools/squashfs3-lzma/patches/140-gcc-10-fix.patch