util-linux: update to 2.38.1

Release Notes:
    https://cdn.kernel.org/pub/linux/utils/util-linux/v2.38/v2.38.1-ReleaseNotes

Remove upstreamed:
- 010-meson-typo.patch
- 020-meson-fix-compilation-without-systemd.patch
- 110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch

Signed-off-by: Linhui Liu <liulinhui36@gmail.com>

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 706c3194b19db3c5a74aebb1dd294651c7bf2c75..21764a2d2703bab9a4189bac88719ce9c23359f0 100644 (file)
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
-PKG_VERSION:=2.38
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=2.38.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.38
-PKG_HASH:=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
+PKG_HASH:=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
 PKG_CPE_ID:=cpe:/a:kernel:util-linux
 
 PKG_LICENSE:=GPL-2.0-only

diff --git a/package/utils/util-linux/patches/010-meson-typo.patch b/package/utils/util-linux/patches/010-meson-typo.patch
deleted file mode 100644 (file)
index 466d942..0000000
--- a/package/utils/util-linux/patches/010-meson-typo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From c387d4fe7a1435a762a5b7d8b75feb13ad613315 Mon Sep 17 00:00:00 2001
-From: Anatoly Pugachev <matorola@gmail.com>
-Date: Fri, 8 Apr 2022 15:34:16 +0300
-Subject: [PATCH] libfdisk: meson.build fix typo
-
----
- libfdisk/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/libfdisk/meson.build
-+++ b/libfdisk/meson.build
-@@ -11,7 +11,7 @@ libfdisk_h = configure_file(
-   output : 'libfdisk.h',
-   configuration : defs,
-   install : build_libfdisk,
--  install_dir : join_paths(get_option('includedir'), 'libfisk'),
-+  install_dir : join_paths(get_option('includedir'), 'libfdisk'),
- )
- 
- lib_fdisk_sources = '''

diff --git a/package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch b/package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch
deleted file mode 100644 (file)
index aa20999..0000000
--- a/package/utils/util-linux/patches/020-meson-fix-compilation-without-systemd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 38b15ca2dc4ca32bbe4a2449e1c7b645e4577840 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Fri, 29 Apr 2022 16:53:43 -0700
-Subject: [PATCH 1/7] meson: fix compilation without systemd
-
-systemdsystemunitdir is used elsewhere.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/meson.build
-+++ b/meson.build
-@@ -720,6 +720,7 @@ if fs_search_path_extra != ''
- endif
- conf.set_quoted('FS_SEARCH_PATH', fs_search_path)
- 
-+systemdsystemunitdir = ''
- if systemd.found()
-   systemdsystemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
- endif

diff --git a/package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch b/package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch
deleted file mode 100644 (file)
index bba8baf..0000000
--- a/package/utils/util-linux/patches/110-meson-fix-when-HAVE_CLOCK_GETTIME-is-set.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e51565b653cf09985df57cb7254b16d5af5df223 Mon Sep 17 00:00:00 2001
-From: Nicolas Caramelli <caramelli.devel@gmail.com>
-Date: Fri, 29 Apr 2022 18:16:36 +0200
-Subject: [PATCH] meson: fix when HAVE_CLOCK_GETTIME is set
-
-Signed-off-by: Nicolas Caramelli <caramelli.devel@gmail.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/meson.build
-+++ b/meson.build
-@@ -602,7 +602,7 @@ if not have
-   have = cc.has_function('clock_gettime',
-                          dependencies : realtime_libs)
- endif
--conf.set('HAVE_CLOCK_GETTIME', have_dirfd ? 1 : false)
-+conf.set('HAVE_CLOCK_GETTIME', have ? 1 : false)
- 
- thread_libs = dependency('threads')
-