https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes
* Switch URL. Release tarballs (using make dist)
were missing files needed to build with meson.
But the files are present in the git snapshot url.
* New liblastlog2 stuff does seem to have various
building issues etc, so disable them for now.
* Old patches dropped, seem to be included in the new release.
Signed-off-by: Christian Melki <christian.me...@t2data.com>
---
...roperly-handle-gettext-non-existence.patch | 29 -------------------
patches/util-linux-2.39.3/series | 4 ---
rules/util-linux.make | 11 +++----
3 files changed, 6 insertions(+), 38 deletions(-)
delete mode 100644
patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
delete mode 100644 patches/util-linux-2.39.3/series
diff --git
a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
deleted file mode 100644
index 01d07d3f6..000000000
---
a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <tho...@t-8ch.de>
-Date: Sat, 5 Aug 2023 08:57:28 +0200
-Subject: [PATCH] meson: properly handle gettext non-existence
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit e91a49c9747f ("meson: don't build po if no gettext")
-tried to add the possibility to build util-linux without gettext.
-
-Unfortunately by default the call to find_program() would abort the
-build if the program is not found.
-Avoid aborting the build.
-
-Signed-off-by: Thomas Weißschuh <tho...@t-8ch.de>
----
- po/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/meson.build b/po/meson.build
-index c10deafd28a6..8adfa48d8327 100644
---- a/po/meson.build
-+++ b/po/meson.build
-@@ -1,4 +1,4 @@
--if not find_program('gettext').found()
-+if not find_program('gettext', required : false).found()
- subdir_done()
- endif
-
diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series
deleted file mode 100644
index ca4f8cdfd..000000000
--- a/patches/util-linux-2.39.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-meson-properly-handle-gettext-non-existence.patch
-# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic
diff --git a/rules/util-linux.make b/rules/util-linux.make
index 2a2215570..60c6e9228 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -15,12 +15,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux
#
# Paths and names
#
-UTIL_LINUX_VERSION := 2.39.3
-UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5
+UTIL_LINUX_VERSION := 2.40
+UTIL_LINUX_MD5 := bc4272a7821bb12c68c441d23b8eaa89
UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION)
-UTIL_LINUX_SUFFIX := tar.xz
-UTIL_LINUX_BASENAME := v$(if $(filter 2,$(basename
$(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION)))
-UTIL_LINUX_URL := $(call ptx/mirror, KERNEL,
utils/util-linux/$(UTIL_LINUX_BASENAME)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX))
+UTIL_LINUX_SUFFIX := tar.gz
+UTIL_LINUX_URL :=
https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
UTIL_LINUX_SOURCE := $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
UTIL_LINUX_DIR := $(BUILDDIR)/$(UTIL_LINUX)
UTIL_LINUX_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND
LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain
@@ -70,6 +69,7 @@ UTIL_LINUX_CONF_OPT := \
-Dbuild-last=disabled \
-Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \
-Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \
+ -Dbuild-liblastlog2=disabled \
-Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \
-Dbuild-libsmartcols=$(call ptx/endis,
PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \
-Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \
@@ -88,6 +88,7 @@ UTIL_LINUX_CONF_OPT := \
-Dbuild-newgrp=disabled \
-Dbuild-nologin=disabled \
-Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \
+ -Dbuild-pam-lastlog2=disabled \
-Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \
-Dbuild-pg=disabled \
-Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \
--
2.34.1
