Skip to content

Commit e69e03a

Browse files
DragonBluepAnsuel
authored andcommitted
tools/squashfs4: update to 4.7.5
Release Note: https://github.com/plougher/squashfs-tools/releases/tag/4.7.5 Remove upstreamed patch: - 0001-mksquashfs-don-t-create-duplicate-virtual-real-disk-.patch Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: openwrt/openwrt#22249 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
1 parent e83da3b commit e69e03a

3 files changed

Lines changed: 30 additions & 106 deletions

File tree

tools/squashfs4/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=squashfs4
1010
PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
11-
PKG_VERSION:=4.7.4
12-
PKG_RELEASE=2
11+
PKG_VERSION:=4.7.5
12+
PKG_RELEASE=1
1313

1414
PKG_SOURCE_PROTO:=git
1515
PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools
16-
PKG_SOURCE_DATE:=2025-11-10
17-
PKG_SOURCE_VERSION:=53e5a67aac42e0bc9ad4a249156d7d549ce7436c
18-
PKG_MIRROR_HASH:=7ce390d95af4b7b4ce768cec18aeb9ac61b8ca413d0ced2c42a81446d9dd8690
16+
PKG_SOURCE_DATE:=2026-03-02
17+
PKG_SOURCE_VERSION:=708c59ae80853b0845017c33b42e56061cc546cd
18+
PKG_MIRROR_HASH:=504dbc8e6709ac904c4e6929ebba6f88c125b2b9775371f0cd5d9967bfba89e1
1919

2020
HOST_BUILD_PARALLEL:=1
2121

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From f88f4a659d6ab432a57e90fe2f6191149c6b343f Mon Sep 17 00:00:00 2001
2+
From: Rui Chen <rui@chenrui.dev>
3+
Date: Sun, 1 Mar 2026 22:10:34 -0500
4+
Subject: [PATCH] fix(mksquashfs): use st_atimespec on macOS
5+
6+
Darwin struct stat does not expose st_atim. Use st_atimespec on macOS while keeping existing behavior on other platforms.
7+
8+
Signed-off-by: Rui Chen <rui@chenrui.dev>
9+
---
10+
squashfs-tools/mksquashfs.c | 4 +++-
11+
1 file changed, 3 insertions(+), 1 deletion(-)
12+
13+
--- a/squashfs-tools/mksquashfs.c
14+
+++ b/squashfs-tools/mksquashfs.c
15+
@@ -3372,7 +3372,9 @@ static struct inode_info *lookup_inode4(
16+
* lazytime or relatime and the file has been created or
17+
* modified since the last access.
18+
*/
19+
-#ifdef st_atime
20+
+#ifdef __APPLE__
21+
+ memset(&buf->st_atimespec, 0, sizeof(buf->st_atimespec));
22+
+#elif defined(st_atime)
23+
memset(&buf->st_atim, 0, sizeof(buf->st_atim));
24+
#else
25+
memset(&buf->st_atime, 0, sizeof(buf->st_atime));

tools/squashfs4/patches/0001-mksquashfs-don-t-create-duplicate-virtual-real-disk-.patch

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)