tools: util-linux: update to 2.42.1
Release notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.42/v2.42.1-ReleaseNotes Remove upstreamed: 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/23432 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
8bd9f4fca1
commit
6418d6fd0b
@ -7,11 +7,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=util-linux
|
PKG_NAME:=util-linux
|
||||||
PKG_VERSION:=2.42
|
PKG_VERSION:=2.42.1
|
||||||
|
|
||||||
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.42
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.42
|
||||||
PKG_HASH:=3452b260bbaa775d6e749ac3bb22111785003fc1f444970025c8da26dfa758e9
|
PKG_HASH:=82e9158eb12a9b0b569d84e1687fed9dd18fe89ccd8ef5ac3427218a7c0d7f7f
|
||||||
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
|
||||||
|
|||||||
@ -1,44 +0,0 @@
|
|||||||
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
|
|
||||||
Loading…
Reference in New Issue
Block a user