tools: util-linux: update to 2.42
Release notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.42/v2.42-ReleaseNotes Remove upstreamed: 010-meson-curses.patch New: 0001-pidutils-gracefully-handle-systems-without-sys-vfs.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>
This commit is contained in:
parent
845fbd0468
commit
c896a812ae
@ -7,11 +7,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=util-linux
|
PKG_NAME:=util-linux
|
||||||
PKG_VERSION:=2.41.3
|
PKG_VERSION:=2.42
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.42
|
||||||
PKG_HASH:=3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b
|
PKG_HASH:=3452b260bbaa775d6e749ac3bb22111785003fc1f444970025c8da26dfa758e9
|
||||||
PKG_CPE_ID:=cpe:/a:kernel:util-linux
|
PKG_CPE_ID:=cpe:/a:kernel:util-linux
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|||||||
@ -0,0 +1,44 @@
|
|||||||
|
From 788d3a1926b47a26db7b2db4be40e42acbadd009 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
|
||||||
|
Date: Sat, 11 Apr 2026 19:39:09 +0200
|
||||||
|
Subject: [PATCH] pidutils: gracefully handle systems without sys/vfs.h /
|
||||||
|
statfs()
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
|
||||||
|
---
|
||||||
|
lib/pidfd-utils.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
--- a/lib/pidfd-utils.c
|
||||||
|
+++ b/lib/pidfd-utils.c
|
||||||
|
@@ -6,7 +6,9 @@
|
||||||
|
*/
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
+#ifdef HAVE_SYS_VFS_H
|
||||||
|
#include <sys/vfs.h>
|
||||||
|
+#endif
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <err.h>
|
||||||
|
@@ -22,6 +24,7 @@
|
||||||
|
*/
|
||||||
|
int pfd_is_pidfs(int pidfd)
|
||||||
|
{
|
||||||
|
+#ifdef HAVE_SYS_VFS_H
|
||||||
|
struct statfs stfs;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
@@ -30,6 +33,9 @@ int pfd_is_pidfs(int pidfd)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return F_TYPE_EQUAL(stfs.f_type, STATFS_PIDFS_MAGIC);
|
||||||
|
+#else
|
||||||
|
+ return 1;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef USE_PIDFD_INO_SUPPORT
|
||||||
@ -1,24 +0,0 @@
|
|||||||
From c1ca5ec4a5c6a0e4acbdcc6ff4e4fa2109c1ec24 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rosen Penev <rosenp@gmail.com>
|
|
||||||
Date: Wed, 30 Jul 2025 14:13:07 -0700
|
|
||||||
Subject: [PATCH] meson: use curses for the non wide version
|
|
||||||
|
|
||||||
The curses dependency in meson in special in that it uses a combination
|
|
||||||
of pkg-config, config-tool, and various system lookups to find it.
|
|
||||||
|
|
||||||
Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
|
||||||
---
|
|
||||||
meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -289,7 +289,7 @@ if lib_ncursesw.found()
|
|
||||||
lib_ncurses = disabler()
|
|
||||||
else
|
|
||||||
lib_ncurses = dependency(
|
|
||||||
- 'ncurses',
|
|
||||||
+ 'curses',
|
|
||||||
disabler : true,
|
|
||||||
required : get_option('ncurses'))
|
|
||||||
headers += ['ncurses.h',
|
|
||||||
Loading…
Reference in New Issue
Block a user