From 2b90347dd62606a9b3904999287efb278797eb98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 23 Jul 2024 21:24:39 +0200 Subject: [PATCH] tools: util-linux: update to v2.40.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also switch from .tar.gz to .tar.xz to align with package/utils/util-linux/Makefile. This makes synchronized updates easier. Release Notes: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40-ReleaseNotes https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40.1-ReleaseNotes https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40.2-ReleaseNotes Signed-off-by: Thomas Weißschuh Link: https://github.com/openwrt/openwrt/pull/15995 Signed-off-by: Hauke Mehrtens --- tools/util-linux/Makefile | 6 +++--- ...1-hexdump-allow-enabling-with-disable-all-programs.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/util-linux/Makefile b/tools/util-linux/Makefile index 0394907a96..f9aadba2c2 100644 --- a/tools/util-linux/Makefile +++ b/tools/util-linux/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.40.1 +PKG_VERSION:=2.40.2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.40 -PKG_HASH:=8e396eececae2b3b68db232c33b8810faa7c31f6df19f98f512739293d5829b7 +PKG_HASH:=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_FIXUP:=autoreconf diff --git a/tools/util-linux/patches/0001-hexdump-allow-enabling-with-disable-all-programs.patch b/tools/util-linux/patches/0001-hexdump-allow-enabling-with-disable-all-programs.patch index c0c1f04d06..a8f1b5eb24 100644 --- a/tools/util-linux/patches/0001-hexdump-allow-enabling-with-disable-all-programs.patch +++ b/tools/util-linux/patches/0001-hexdump-allow-enabling-with-disable-all-programs.patch @@ -13,7 +13,7 @@ Signed-off-by: Robert Marko --- a/configure.ac +++ b/configure.ac -@@ -2237,7 +2237,11 @@ UL_BUILD_INIT([column], [check]) +@@ -2240,7 +2240,11 @@ UL_BUILD_INIT([column], [check]) UL_REQUIRES_BUILD([column], [libsmartcols]) AM_CONDITIONAL([BUILD_COLUMN], [test "x$build_column" = xyes]) -- 2.30.2