tools: util-linux: update to v2.41
Release Notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.41/v2.41-ReleaseNotes Remove upstreamed: 0001-hexdump-allow-enabling-with-disable-all-programs.patch 110-pkgconfig-static.patch Refresh: 101-macos-weak-aliases.patch Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> Link: https://github.com/openwrt/openwrt/pull/18493 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
907cb88e10
commit
7bbb78c622
4 changed files with 4 additions and 56 deletions
|
@ -7,11 +7,11 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=util-linux
|
PKG_NAME:=util-linux
|
||||||
PKG_VERSION:=2.40.2
|
PKG_VERSION:=2.41
|
||||||
|
|
||||||
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.40
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
|
||||||
PKG_HASH:=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3
|
PKG_HASH:=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6
|
||||||
PKG_CPE_ID:=cpe:/a:kernel:util-linux
|
PKG_CPE_ID:=cpe:/a:kernel:util-linux
|
||||||
|
|
||||||
PKG_FIXUP:=autoreconf
|
PKG_FIXUP:=autoreconf
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
From 37641f246ee9df7289b4e3054b3ded3912773722 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Robert Marko <robimarko@gmail.com>
|
|
||||||
Date: Tue, 25 Jun 2024 17:32:08 +0200
|
|
||||||
Subject: [PATCH] hexdump: allow enabling with --disable-all-programs
|
|
||||||
|
|
||||||
Currently, if --disable-all-programs is used hexdump cannot be built
|
|
||||||
as --enable-hexdump is not recognized, so lets add support for it.
|
|
||||||
|
|
||||||
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
||||||
---
|
|
||||||
configure.ac | 6 +++++-
|
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -2240,7 +2240,11 @@ UL_BUILD_INIT([column], [check])
|
|
||||||
UL_REQUIRES_BUILD([column], [libsmartcols])
|
|
||||||
AM_CONDITIONAL([BUILD_COLUMN], [test "x$build_column" = xyes])
|
|
||||||
|
|
||||||
-UL_BUILD_INIT([hexdump], [yes])
|
|
||||||
+AC_ARG_ENABLE([hexdump],
|
|
||||||
+ AS_HELP_STRING([--disable-hexdump], [do not build hexdump]),
|
|
||||||
+ [], [UL_DEFAULT_ENABLE([hexdump], [check])]
|
|
||||||
+)
|
|
||||||
+UL_BUILD_INIT([hexdump])
|
|
||||||
AM_CONDITIONAL([BUILD_HEXDUMP], [test "x$build_hexdump" = xyes])
|
|
||||||
|
|
||||||
UL_BUILD_INIT([rev], [yes])
|
|
|
@ -13,7 +13,7 @@ Fixes util-linux/util-linux#2873
|
||||||
|
|
||||||
--- a/libuuid/src/uuid_time.c
|
--- a/libuuid/src/uuid_time.c
|
||||||
+++ b/libuuid/src/uuid_time.c
|
+++ b/libuuid/src/uuid_time.c
|
||||||
@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, stru
|
@@ -144,6 +144,10 @@ time_t __uuid_time(const uuid_t uu, stru
|
||||||
}
|
}
|
||||||
#if defined(__USE_TIME_BITS64) && defined(__GLIBC__)
|
#if defined(__USE_TIME_BITS64) && defined(__GLIBC__)
|
||||||
extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time")));
|
extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time")));
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
From 81ea117e0396274808a77d40bf11af44ea047285 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rosen Penev <rosenp@gmail.com>
|
|
||||||
Date: Mon, 23 Sep 2024 12:01:40 +0200
|
|
||||||
Subject: [PATCH] pkgconfig: adjust for static libraries
|
|
||||||
|
|
||||||
OpenWrt builds only static libuuid for tools. Adjust the pkgconfig file
|
|
||||||
accordingly.
|
|
||||||
|
|
||||||
Addresses: https://github.com/util-linux/util-linux/issues/3210
|
|
||||||
Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
|
||||||
---
|
|
||||||
libuuid/uuid.pc.in | 2 +-
|
|
||||||
1 file changed, 1 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/libuuid/uuid.pc.in
|
|
||||||
+++ b/libuuid/uuid.pc.in
|
|
||||||
@@ -6,6 +6,5 @@ includedir=@includedir@
|
|
||||||
Name: uuid
|
|
||||||
Description: Universally unique id library
|
|
||||||
Version: @LIBUUID_VERSION@
|
|
||||||
-Requires:
|
|
||||||
Cflags: -I${includedir}/uuid
|
|
||||||
-Libs: -L${libdir} -luuid
|
|
||||||
+Libs: -L${libdir} -luuid -lpthread
|
|
Loading…
Reference in a new issue