From 2610ae9e281fe69de54e52f856401aaaf3666c98 Mon Sep 17 00:00:00 2001 From: Osama Abdelkader Date: Tue, 19 Aug 2025 01:20:39 +0200 Subject: squashfs-tools: upgrade 4.7 -> 4.7.2 Changes: Fix build with non-static include print_pager: make inline quoted_bs_char() static Release notes: https://github.com/plougher/squashfs-tools/releases/tag/4.7.2 (From OE-Core rev: ccba60186ba9b71bce8f5158b423d09d9d1bb851) Signed-off-by: Osama Abdelkader Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../squashfs-tools/squashfs-tools/pid.patch | 40 -------------------- .../squashfs-tools/squashfs-tools/thread.patch | 33 ----------------- .../squashfs-tools/squashfs-tools_4.7.2.bb | 41 +++++++++++++++++++++ .../squashfs-tools/squashfs-tools_4.7.bb | 43 ---------------------- 4 files changed, 41 insertions(+), 116 deletions(-) delete mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch delete mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb delete mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch deleted file mode 100644 index a15b621124..0000000000 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 6 Jun 2025 15:23:07 +0100 -Subject: [PATCH] print_pager: add missing includes - -When building with musl: - - print_pager.h:33:25: error: unknown type name 'pid_t' - 33 | extern void wait_to_die(pid_t process); - | ^~~~~ - print_pager.h:34:25: error: unknown type name 'pid_t' - 34 | extern FILE *exec_pager(pid_t *process); - | ^~~~~ - -print_pager.h uses pid_t and FILE, so add the required #includes to -ensure that these are defined. - -Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/314] -Signed-off-by: Ross Burton ---- - squashfs-tools/print_pager.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/squashfs-tools/print_pager.h b/squashfs-tools/print_pager.h -index c33d4d2e..f3e0da6c 100644 ---- a/squashfs-tools/print_pager.h -+++ b/squashfs-tools/print_pager.h -@@ -30,6 +30,9 @@ - #define MORE_PAGER 2 - #define UNKNOWN_PAGER 3 - -+#include -+#include -+ - extern void wait_to_die(pid_t process); - extern FILE *exec_pager(pid_t *process); - extern int get_column_width(); --- -2.43.0 - diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch deleted file mode 100644 index 01741639c0..0000000000 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b6e9f4b62cc3e762ceeddc0fc099f7d65f7b7361 Mon Sep 17 00:00:00 2001 -From: Shiji Yang -Date: Wed, 4 Jun 2025 19:53:39 +0800 -Subject: [PATCH] thread: add the missing pthread.h header - -Fix build error on macos: - -In file included from mksquashfs_help.c:35: -./thread.h:46:39: error: unknown type name 'pthread_mutex_t'; did you mean 'pthread_attr_t'? - 46 | extern void wait_thread_idle(int tid, pthread_mutex_t *mutex); - | ^~~~~~~~~~~~~~~ - | pthread_attr_t - -Signed-off-by: Shiji Yang - -Upstream-Status: Backport [b6e9f4b62cc3e762ceeddc0fc099f7d65f7b7361] -Signed-off-by: Ross Burton ---- - squashfs-tools/thread.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/squashfs-tools/thread.h b/squashfs-tools/thread.h -index 5a22fc43..e56a58cf 100644 ---- a/squashfs-tools/thread.h -+++ b/squashfs-tools/thread.h -@@ -22,6 +22,7 @@ - * - * thread.h - */ -+#include - - #define TRUE 1 - #define FALSE 0 diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb new file mode 100644 index 0000000000..8bca98f419 --- /dev/null +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "Tools for manipulating SquashFS filesystems" +HOMEPAGE = "https://github.com/plougher/squashfs-tools" +DESCRIPTION = "Tools to create and extract Squashfs filesystems." +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV}" +SRCREV = "99d23a31b471433c51e9c145aeba2ab1536e34df" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" + +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" + +PACKAGECONFIG ??= "gzip lz4 xz zstd xattr" +PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib" +PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz" +PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo" +PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4" +PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz" +PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd" +PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" + +do_compile() { + oe_runmake -C ${S}/squashfs-tools all +} + +do_install() { + oe_runmake -C ${S}/squashfs-tools install INSTALL_PREFIX=${D}${prefix} INSTALL_MANPAGES_DIR=${D}${datadir}/man/man1 + + install -d "${D}${includedir}" + install -m 0644 "${S}"/squashfs-tools/squashfs_fs.h "${D}${includedir}" +} + +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "squashfs" diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb deleted file mode 100644 index 8006f80aee..0000000000 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Tools for manipulating SquashFS filesystems" -HOMEPAGE = "https://github.com/plougher/squashfs-tools" -DESCRIPTION = "Tools to create and extract Squashfs filesystems." -SECTION = "base" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV} \ - file://pid.patch \ - file://thread.patch" -SRCREV = "2e87d42ed089dc31990d83eeb07437b9d085d6d1" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" - -EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" - -PACKAGECONFIG ??= "gzip lz4 xz zstd xattr" -PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib" -PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz" -PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo" -PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4" -PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz" -PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd" -PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" - -do_compile() { - oe_runmake -C ${S}/squashfs-tools all -} - -do_install() { - oe_runmake -C ${S}/squashfs-tools install INSTALL_PREFIX=${D}${prefix} INSTALL_MANPAGES_DIR=${D}${datadir}/man/man1 - - install -d "${D}${includedir}" - install -m 0644 "${S}"/squashfs-tools/squashfs_fs.h "${D}${includedir}" -} - -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" -ARM_INSTRUCTION_SET:armv6 = "arm" - -BBCLASSEXTEND = "native nativesdk" - -CVE_PRODUCT = "squashfs" -- cgit v1.2.3-54-g00ecf