]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
util-linux: update to 2.42 22878/head
authorThomas Weißschuh <thomas@t-8ch.de>
Fri, 10 Apr 2026 15:40:53 +0000 (17:40 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Wed, 22 Apr 2026 23:08:36 +0000 (01:08 +0200)
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: https://github.com/openwrt/openwrt/pull/22878
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
package/utils/util-linux/Makefile
package/utils/util-linux/patches/0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch [new file with mode: 0644]

index a87c0688137a74f92cbe482972085a749971e98a..65bfc1d884844a22637212dc4d4a1d7b96759eba 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
-PKG_VERSION:=2.41.3
+PKG_VERSION:=2.42
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
-PKG_HASH:=3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.42
+PKG_HASH:=3452b260bbaa775d6e749ac3bb22111785003fc1f444970025c8da26dfa758e9
 PKG_CPE_ID:=cpe:/a:kernel:util-linux
 
 PKG_INSTALL:=1
@@ -202,7 +202,7 @@ endef
 define Package/column
 $(call Package/util-linux/Default)
   TITLE:=column formats input into multiple columns
-  DEPENDS:= +libsmartcols
+  DEPENDS:= +libsmartcols +libncursesw
   LICENSE:=LGPL-2.1-or-later
   LICENSE_FILES:=Documentation/licenses/COPYING.LGPL-2.1-or-later
 endef
diff --git a/package/utils/util-linux/patches/0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch b/package/utils/util-linux/patches/0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch
new file mode 100644 (file)
index 0000000..fe4c987
--- /dev/null
@@ -0,0 +1,30 @@
+From af6168533cb011489bd0b4b1a2fbbaaeec6859b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
+Date: Fri, 10 Apr 2026 18:04:58 +0200
+Subject: [PATCH] meson: test for statx::stx_mnt_id in sys/stat.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both the check for the general availability of 'struct statx' and the
+code actual code use sys/stat.h and not linux/stat.h.
+
+The test for stx_mnt_id also needs to test in sys/stat.h as otherwise
+the detection result is wrong.
+
+Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/meson.build
++++ b/meson.build
+@@ -111,7 +111,7 @@ conf.set('HAVE_MOUNTFD_API', have_mountf
+ have_struct_statx = cc.has_type('struct statx', args : '-D_GNU_SOURCE', prefix : '#include <sys/stat.h>')
+ conf.set('HAVE_STRUCT_STATX', have_struct_statx ? 1 : false)
+ have = cc.has_member('struct statx', 'stx_mnt_id',
+-                     prefix : '#include <linux/stat.h>')
++                     prefix : '#include <sys/stat.h>')
+ conf.set('HAVE_STRUCT_STATX_STX_MNT_ID', have ? 1 : false)