Skip to content

Commit 447cd67

Browse files
t-8chrobimarko
authored andcommitted
util-linux: update to v2.41
Release Notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.41/v2.41-ReleaseNotes New: 0001-meson-add-feature-for-translated-documentation.patch 0001-meson-remove-tinfo-dependency-from-more.patch Signed-off-by: Thomas Weißschuh <[email protected]> Link: openwrt/openwrt#18493 Signed-off-by: Robert Marko <[email protected]>
1 parent 7bbb78c commit 447cd67

File tree

3 files changed

+80
-4
lines changed

3 files changed

+80
-4
lines changed

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.40.2
11+
PKG_VERSION:=2.41
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15-
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.40
16-
PKG_HASH:=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3
15+
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
16+
PKG_HASH:=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6
1717
PKG_CPE_ID:=cpe:/a:kernel:util-linux
1818

1919
PKG_LICENSE:=GPL-2.0-only
@@ -581,6 +581,7 @@ MESON_ARGS += \
581581
-Dlibuser=disabled \
582582
-Duse-tty-group=false \
583583
-Duse-tls=false \
584+
-Dtranslate-docs=disabled \
584585
-Dbuild-python=disabled \
585586
-Dbuild-zramctl=disabled \
586587
-Dbuild-fsck=disabled \
@@ -594,7 +595,6 @@ MESON_ARGS += \
594595
-Dbuild-fdformat=disabled \
595596
-Dbuild-lslogins=disabled \
596597
-Dbuild-wdctl=disabled \
597-
-Dbuild-cal=disabled \
598598
-Dbuild-switch_root=disabled \
599599
-Dbuild-pivot_root=disabled \
600600
-Dbuild-lsmem=disabled \
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From cd5038306e6815592fafbd06d406f45af2df3fcc Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <[email protected]>
3+
Date: Mon, 14 Apr 2025 23:32:36 +0200
4+
Subject: [PATCH] meson: add feature for translated documentation
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
Translating the documentation is slow.
10+
Add a feature which can be used to disable this step.
11+
12+
Signed-off-by: Thomas Weißschuh <[email protected]>
13+
---
14+
meson_options.txt | 2 ++
15+
po-man/meson.build | 2 +-
16+
2 files changed, 3 insertions(+), 1 deletion(-)
17+
18+
--- a/meson_options.txt
19+
+++ b/meson_options.txt
20+
@@ -25,6 +25,8 @@ option('sysvinit', type : 'feature',
21+
option('btrfs', type : 'feature')
22+
option('widechar', type : 'feature',
23+
description : 'compile with wide character support')
24+
+option('translate-docs', type : 'feature',
25+
+ description : 'translate documentation')
26+
27+
# enable building of various programs and features ("build-" prefix)
28+
29+
--- a/po-man/meson.build
30+
+++ b/po-man/meson.build
31+
@@ -1,6 +1,6 @@
32+
po4a = find_program('po4a', required : false)
33+
34+
-if not (asciidoctor.found() and po4a.found())
35+
+if not get_option('translate-docs').require(asciidoctor.found()).require(po4a.found()).allowed()
36+
subdir_done()
37+
endif
38+
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 363e48da01956321fb9337c59d78865c97c711a2 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <[email protected]>
3+
Date: Mon, 14 Apr 2025 23:19:06 +0200
4+
Subject: [PATCH] meson: remove tinfo dependency from 'more'
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
The more utility does not need libtinfo and it is not
10+
specified in autotools either.
11+
12+
Signed-off-by: Thomas Weißschuh <[email protected]>
13+
---
14+
meson.build | 6 ++----
15+
1 file changed, 2 insertions(+), 4 deletions(-)
16+
17+
--- a/meson.build
18+
+++ b/meson.build
19+
@@ -1387,8 +1387,7 @@ exe = executable(
20+
more_sources,
21+
link_with : [lib_common],
22+
include_directories : includes,
23+
- dependencies : [lib_tinfo,
24+
- curses_libs,
25+
+ dependencies : [curses_libs,
26+
lib_magic],
27+
install : opt,
28+
build_by_default : opt)
29+
@@ -1398,8 +1397,7 @@ exe2 = executable(
30+
link_with : [lib_common],
31+
include_directories : includes,
32+
c_args : '-DTEST_PROGRAM',
33+
- dependencies : [lib_tinfo,
34+
- curses_libs,
35+
+ dependencies : [curses_libs,
36+
lib_magic],
37+
build_by_default : opt and program_tests)
38+
exes += exe

0 commit comments

Comments
 (0)