diff options
| author | Osama Abdelkader <osama.abdelkader@gmail.com> | 2025-08-19 01:20:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-21 10:29:56 +0100 |
| commit | 2610ae9e281fe69de54e52f856401aaaf3666c98 (patch) | |
| tree | b13d3768b633afaefaa0ebf078578dd8af1a5192 | |
| parent | 34df6b71b9f997229568429815530820e3f4216d (diff) | |
| download | poky-2610ae9e281fe69de54e52f856401aaaf3666c98.tar.gz | |
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 <osama.abdelkader@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools/pid.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools/thread.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb (renamed from meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb) | 6 |
3 files changed, 2 insertions, 77 deletions
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 @@ | |||
| 1 | From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ross Burton <ross.burton@arm.com> | ||
| 3 | Date: Fri, 6 Jun 2025 15:23:07 +0100 | ||
| 4 | Subject: [PATCH] print_pager: add missing includes | ||
| 5 | |||
| 6 | When building with musl: | ||
| 7 | |||
| 8 | print_pager.h:33:25: error: unknown type name 'pid_t' | ||
| 9 | 33 | extern void wait_to_die(pid_t process); | ||
| 10 | | ^~~~~ | ||
| 11 | print_pager.h:34:25: error: unknown type name 'pid_t' | ||
| 12 | 34 | extern FILE *exec_pager(pid_t *process); | ||
| 13 | | ^~~~~ | ||
| 14 | |||
| 15 | print_pager.h uses pid_t and FILE, so add the required #includes to | ||
| 16 | ensure that these are defined. | ||
| 17 | |||
| 18 | Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/314] | ||
| 19 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 20 | --- | ||
| 21 | squashfs-tools/print_pager.h | 3 +++ | ||
| 22 | 1 file changed, 3 insertions(+) | ||
| 23 | |||
| 24 | diff --git a/squashfs-tools/print_pager.h b/squashfs-tools/print_pager.h | ||
| 25 | index c33d4d2e..f3e0da6c 100644 | ||
| 26 | --- a/squashfs-tools/print_pager.h | ||
| 27 | +++ b/squashfs-tools/print_pager.h | ||
| 28 | @@ -30,6 +30,9 @@ | ||
| 29 | #define MORE_PAGER 2 | ||
| 30 | #define UNKNOWN_PAGER 3 | ||
| 31 | |||
| 32 | +#include <stdio.h> | ||
| 33 | +#include <sys/types.h> | ||
| 34 | + | ||
| 35 | extern void wait_to_die(pid_t process); | ||
| 36 | extern FILE *exec_pager(pid_t *process); | ||
| 37 | extern int get_column_width(); | ||
| 38 | -- | ||
| 39 | 2.43.0 | ||
| 40 | |||
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 @@ | |||
| 1 | From b6e9f4b62cc3e762ceeddc0fc099f7d65f7b7361 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Shiji Yang <yangshiji66@outlook.com> | ||
| 3 | Date: Wed, 4 Jun 2025 19:53:39 +0800 | ||
| 4 | Subject: [PATCH] thread: add the missing pthread.h header | ||
| 5 | |||
| 6 | Fix build error on macos: | ||
| 7 | |||
| 8 | In file included from mksquashfs_help.c:35: | ||
| 9 | ./thread.h:46:39: error: unknown type name 'pthread_mutex_t'; did you mean 'pthread_attr_t'? | ||
| 10 | 46 | extern void wait_thread_idle(int tid, pthread_mutex_t *mutex); | ||
| 11 | | ^~~~~~~~~~~~~~~ | ||
| 12 | | pthread_attr_t | ||
| 13 | |||
| 14 | Signed-off-by: Shiji Yang <yangshiji66@outlook.com> | ||
| 15 | |||
| 16 | Upstream-Status: Backport [b6e9f4b62cc3e762ceeddc0fc099f7d65f7b7361] | ||
| 17 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 18 | --- | ||
| 19 | squashfs-tools/thread.h | 1 + | ||
| 20 | 1 file changed, 1 insertion(+) | ||
| 21 | |||
| 22 | diff --git a/squashfs-tools/thread.h b/squashfs-tools/thread.h | ||
| 23 | index 5a22fc43..e56a58cf 100644 | ||
| 24 | --- a/squashfs-tools/thread.h | ||
| 25 | +++ b/squashfs-tools/thread.h | ||
| 26 | @@ -22,6 +22,7 @@ | ||
| 27 | * | ||
| 28 | * thread.h | ||
| 29 | */ | ||
| 30 | +#include <pthread.h> | ||
| 31 | |||
| 32 | #define TRUE 1 | ||
| 33 | #define FALSE 0 | ||
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb index 8006f80aee..8bca98f419 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.2.bb | |||
| @@ -5,10 +5,8 @@ SECTION = "base" | |||
| 5 | LICENSE = "GPL-2.0-only" | 5 | LICENSE = "GPL-2.0-only" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV} \ | 8 | SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master;tag=${PV}" |
| 9 | file://pid.patch \ | 9 | SRCREV = "99d23a31b471433c51e9c145aeba2ab1536e34df" |
| 10 | file://thread.patch" | ||
| 11 | SRCREV = "2e87d42ed089dc31990d83eeb07437b9d085d6d1" | ||
| 12 | 10 | ||
| 13 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
| 14 | 12 | ||
