From 213e67d6f02030f7690f0c8aa241bfe0e7f5e63f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 17 Dec 2025 00:14:44 +0100 Subject: [PATCH] package/kvmtool: bump to git version 7ad32e5514 For the commit log, see: https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/log/?id=7ad32e5514aca2b6d19398fd3ae5a7c5e0e1ce24 This commit also removes package patches which are now upstream. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...lude-libgen-h-for-musl-compatibility.patch | 48 ------------------- package/kvmtool/kvmtool.hash | 2 +- package/kvmtool/kvmtool.mk | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch diff --git a/package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch b/package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch deleted file mode 100644 index e75ede6af1..0000000000 --- a/package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ba6830eec0f5ab734b093657b16b555e0437b927 Mon Sep 17 00:00:00 2001 -From: Thomas Perale -Date: Sun, 29 Jun 2025 22:22:21 +0200 -Subject: vfio: include libgen.h (for musl compatibility) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting GCC14 'implicit-function-declaration' are treated as errors by -default. When building kvmtool with musl libc, the following error -occurs due to missing declaration of 'basename': - -vfio/core.c:537:22: error: implicit declaration of function ‘basename’ [-Wimplicit-function-declaration] - 537 | group_name = basename(group_path); - | ^~~~~~~~ -vfio/core.c:537:22: warning: nested extern declaration of ‘basename’ [-Wnested-externs] -vfio/core.c:537:20: error: assignment to ‘char *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] - 537 | group_name = basename(group_path); - | ^ - -This patch fixes the issue by including the appropriate header, ensuring -compatibility with musl and GCC14. - -Signed-off-by: Thomas Perale -Reviewed-by: Alexandru Elisei -Link: https://lore.kernel.org/r/20250629202221.893360-1-thomas.perale@mind.be -Signed-off-by: Will Deacon -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=ba6830eec0f5ab734b093657b16b555e0437b927 -Signed-off-by: Thomas Perale ---- - vfio/core.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vfio/core.c b/vfio/core.c -index 3ff2c0b0..8f884898 100644 ---- a/vfio/core.c -+++ b/vfio/core.c -@@ -3,6 +3,7 @@ - #include "kvm/ioport.h" - - #include -+#include - - #define VFIO_DEV_DIR "/dev/vfio" - #define VFIO_DEV_NODE VFIO_DEV_DIR "/vfio" --- -cgit 1.2.3-korg - diff --git a/package/kvmtool/kvmtool.hash b/package/kvmtool/kvmtool.hash index 8df6f929df..6a4219372f 100644 --- a/package/kvmtool/kvmtool.hash +++ b/package/kvmtool/kvmtool.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 18841c414e82b405a0bd6f5c546bc088becd298c1145a2bac97563e699231925 kvmtool-1117dbc8ceb21abc6e8cd9861450695995852290-git4.tar.gz +sha256 655f7691fc80416161b1d832575abfcd1223fbefa2900653ed5ddaab3ee738ec kvmtool-7ad32e5514aca2b6d19398fd3ae5a7c5e0e1ce24-git4.tar.gz sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 58ca2d3642..80248807e1 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVMTOOL_VERSION = 1117dbc8ceb21abc6e8cd9861450695995852290 +KVMTOOL_VERSION = 7ad32e5514aca2b6d19398fd3ae5a7c5e0e1ce24 KVMTOOL_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git KVMTOOL_SITE_METHOD = git KVMTOOL_DEPENDENCIES = \