OpenWrt/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-10-30 07:49:23 +08:00
Code Releases Activity

tools/squashfs4: update to 4.7.2

Browse Source 
This minor version update only includes some build fixes and
improvements.

Release Notes:
  https://github.com/plougher/squashfs-tools/releases/tag/4.7.1
  https://github.com/plougher/squashfs-tools/releases/tag/4.7.2

Remove upstream patches:
  001-thread-add-the-missing-pthread.h-header.patch[1]
  002-print_pager-add-missing-includes.patch[2]

[1] b6e9f4b62c
[2] 05a895b3f9

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19820
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Shiji Yang
2025-08-20 19:32:11 +08:00
committed by Nick Hainke
parent 43ef1a468c
commit d01165a6ce
3 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/squashfs4/Makefile
View File

@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=squashfs4
PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
PKG_VERSION:=4.7.0
PKG_RELEASE=2
PKG_VERSION:=4.7.2
PKG_RELEASE=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools
PKG_SOURCE_DATE:=2025-06-04
PKG_SOURCE_VERSION:=2e87d42ed089dc31990d83eeb07437b9d085d6d1
PKG_MIRROR_HASH:=ff5c545b8d64e1c3a1316abde0b6ba297c267fa3daed264eff2038dc99649869
PKG_SOURCE_DATE:=2025-08-19
PKG_SOURCE_VERSION:=99d23a31b471433c51e9c145aeba2ab1536e34df
PKG_MIRROR_HASH:=229a1b8f465fa0f576b5ace1753a8e9d28a2c4254ec2b019668baa676094f6c3
HOST_BUILD_PARALLEL:=1

28
tools/squashfs4/patches/001-thread-add-the-missing-pthread.h-header.patch
View File

@ -1,28 +0,0 @@
From 8931019e6be6e584538ae38978ff68d5b53c96fe Mon Sep 17 00:00:00 2001
From: Shiji Yang <yangshiji66@outlook.com>
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 <yangshiji66@outlook.com>
---
squashfs-tools/thread.h | 1 +
1 file changed, 1 insertion(+)
--- a/squashfs-tools/thread.h
+++ b/squashfs-tools/thread.h
@@ -22,6 +22,7 @@
*
* thread.h
*/
+#include <pthread.h>
#define TRUE 1
#define FALSE 0

34
tools/squashfs4/patches/002-print_pager-add-missing-includes.patch
View File

@ -1,34 +0,0 @@
From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
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.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
squashfs-tools/print_pager.h | 3 +++
1 file changed, 3 insertions(+)
--- 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 <stdio.h>
+#include <sys/types.h>
+
extern void wait_to_die(pid_t process);
extern FILE *exec_pager(pid_t *process);
extern int get_column_width();