diff options
| author | Wei-Ting Yang | 2025-12-24 15:16:00 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-01-02 13:34:58 +0000 |
| commit | a20349be32058817c582fffc9078ac5ba64eda9d (patch) | |
| tree | b8170f2da478a9a2712b2ef83f90bc3f6d445ba1 | |
| parent | 787c268cbc59ecf88f45f8b0b9a682a79710710a (diff) | |
| download | openwrt-a20349be32058817c582fffc9078ac5ba64eda9d.tar.gz | |
tools: util-linux: update to 2.41.3
Release notes:
https://www.kernel.org/pub/linux/utils/util-linux/v2.41/v2.41.3-ReleaseNotes
Remove upstreamed:
110-meson-fix-a-bug-in-posixipc_libs-configuration.patch
Signed-off-by: Wei-Ting Yang <williamatcg@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21276
(cherry picked from commit 99fd5aa496a6684994af23500fb851758987a8f1)
Link: https://github.com/openwrt/openwrt/pull/21357
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | tools/util-linux/Makefile | 6 | ||||
| -rw-r--r-- | tools/util-linux/patches/110-meson-fix-a-bug-in-posixipc_libs-configuration.patch | 23 |
2 files changed, 3 insertions, 26 deletions
diff --git a/tools/util-linux/Makefile b/tools/util-linux/Makefile index 541487c85c..c91bf0d492 100644 --- a/tools/util-linux/Makefile +++ b/tools/util-linux/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2025 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.41.2 +PKG_VERSION:=2.41.3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41 -PKG_HASH:=6062a1d89b571a61932e6fc0211f36060c4183568b81ee866cf363bce9f6583e +PKG_HASH:=3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b PKG_CPE_ID:=cpe:/a:kernel:util-linux include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/util-linux/patches/110-meson-fix-a-bug-in-posixipc_libs-configuration.patch b/tools/util-linux/patches/110-meson-fix-a-bug-in-posixipc_libs-configuration.patch deleted file mode 100644 index a6ec1b83d0..0000000000 --- a/tools/util-linux/patches/110-meson-fix-a-bug-in-posixipc_libs-configuration.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 946c0b9c6f6481ed9370b8bd0f54a622a0c4a574 Mon Sep 17 00:00:00 2001 -From: Martin Valgur <martin.valgur@gmail.com> -Date: Tue, 15 Apr 2025 16:19:21 +0300 -Subject: [PATCH] meson: fix a bug in posixipc_libs configuration - -Should append instead of assigning. Otherwise fails with - -meson.build:1482:22: ERROR: Object <[ExternalLibraryHolder] holds [ExternalLibrary]: <ExternalLibrary rt: True>> of type ExternalLibrary does not support the `+` operator. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -1473,7 +1473,7 @@ has_seminfo_type = cc.has_type('struct s - - posixipc_libs = [] - if not cc.has_function('shm_open') and conf.get('HAVE_SYS_MMAN_H').to_string() == '1' -- posixipc_libs = cc.find_library('rt', required : true) -+ posixipc_libs += cc.find_library('rt', required : true) - endif - - if not cc.has_function('sem_close') and conf.get('HAVE_SEMAPHORE_H').to_string() == '1' |