Skip to content

Commit 1a1bdcd

Browse files
t-8chhauke
authored andcommitted
util-linux: update to 2.42
Release notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.42/v2.42-ReleaseNotes New: 0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> Link: openwrt/openwrt#22878 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent c896a81 commit 1a1bdcd

2 files changed

Lines changed: 34 additions & 4 deletions

File tree

package/utils/util-linux/Makefile

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

1010
PKG_NAME:=util-linux
11-
PKG_VERSION:=2.41.3
11+
PKG_VERSION:=2.42
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15-
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
16-
PKG_HASH:=3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b
15+
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.42
16+
PKG_HASH:=3452b260bbaa775d6e749ac3bb22111785003fc1f444970025c8da26dfa758e9
1717
PKG_CPE_ID:=cpe:/a:kernel:util-linux
1818

1919
PKG_INSTALL:=1
@@ -202,7 +202,7 @@ endef
202202
define Package/column
203203
$(call Package/util-linux/Default)
204204
TITLE:=column formats input into multiple columns
205-
DEPENDS:= +libsmartcols
205+
DEPENDS:= +libsmartcols +libncursesw
206206
LICENSE:=LGPL-2.1-or-later
207207
LICENSE_FILES:=Documentation/licenses/COPYING.LGPL-2.1-or-later
208208
endef
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From af6168533cb011489bd0b4b1a2fbbaaeec6859b2 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
3+
Date: Fri, 10 Apr 2026 18:04:58 +0200
4+
Subject: [PATCH] meson: test for statx::stx_mnt_id in sys/stat.h
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
Both the check for the general availability of 'struct statx' and the
10+
code actual code use sys/stat.h and not linux/stat.h.
11+
12+
The test for stx_mnt_id also needs to test in sys/stat.h as otherwise
13+
the detection result is wrong.
14+
15+
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
16+
---
17+
meson.build | 2 +-
18+
1 file changed, 1 insertion(+), 1 deletion(-)
19+
20+
--- a/meson.build
21+
+++ b/meson.build
22+
@@ -111,7 +111,7 @@ conf.set('HAVE_MOUNTFD_API', have_mountf
23+
have_struct_statx = cc.has_type('struct statx', args : '-D_GNU_SOURCE', prefix : '#include <sys/stat.h>')
24+
conf.set('HAVE_STRUCT_STATX', have_struct_statx ? 1 : false)
25+
have = cc.has_member('struct statx', 'stx_mnt_id',
26+
- prefix : '#include <linux/stat.h>')
27+
+ prefix : '#include <sys/stat.h>')
28+
conf.set('HAVE_STRUCT_STATX_STX_MNT_ID', have ? 1 : false)
29+
30+

0 commit comments

Comments
 (0)