From edf927690ec1bb6d3b96255be19c0588f1a94a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 23 Jul 2024 21:22:17 +0200 Subject: [PATCH] util-linux: update to v2.40.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Remove upstreamed: 0001-meson-Fix-build-python-option.patch Signed-off-by: Thomas Weißschuh Link: https://github.com/openwrt/openwrt/pull/15995 Signed-off-by: Hauke Mehrtens --- package/utils/util-linux/Makefile | 4 +-- .../0001-meson-Fix-build-python-option.patch | 31 ------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 package/utils/util-linux/patches/0001-meson-Fix-build-python-option.patch diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 0e04ec8caf..83f3a8c842 100644 --- 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.40.1 +PKG_VERSION:=2.40.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.40 -PKG_HASH:=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f +PKG_HASH:=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0-only diff --git a/package/utils/util-linux/patches/0001-meson-Fix-build-python-option.patch b/package/utils/util-linux/patches/0001-meson-Fix-build-python-option.patch deleted file mode 100644 index e84fe5e705..0000000000 --- a/package/utils/util-linux/patches/0001-meson-Fix-build-python-option.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b66b70d62e50923502aeb3f6420a5f9c20f769d3 Mon Sep 17 00:00:00 2001 -From: Jordan Williams -Date: Thu, 9 May 2024 15:57:12 -0500 -Subject: [PATCH] meson: Fix build-python option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The build-python option is for controlling whether or not pylibmount is -built. -Unfortunately, commit b6799cc rendered the option unused. -This change uses the build-python option again. - -Signed-off-by: Jordan Williams -Signed-off-by: Thomas Weißschuh ---- - libmount/python/meson.build | 40 ++++++++++++++++++------------------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -diff --git a/libmount/python/meson.build b/libmount/python/meson.build -index 72985eca6b21..5dcdf807da89 100644 ---- a/libmount/python/meson.build -+++ b/libmount/python/meson.build -@@ -1,4 +1,6 @@ --build_python = python.found() -+if get_option('build-python').disabled() -+ subdir_done() -+endif - - pylibmount_sources = ''' - pylibmount.c