From b393bff8c44be37f0b56bee61fdd1fef29f16e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Thu, 11 Sep 2025 22:27:48 +0100 Subject: [PATCH] package/kvmtool: bump to current HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By doing so we can also drop the patches for musl which have now been merged upstream. Reviewed-by: Jesse Taube Signed-off-by: Alex Bennée Signed-off-by: Julien Olivain --- ...e-h-inclusion-for-musl-compatibility.patch | 52 ------------------- package/kvmtool/kvmtool.hash | 2 +- package/kvmtool/kvmtool.mk | 2 +- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch diff --git a/package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch b/package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch deleted file mode 100644 index 3128a23689..0000000000 --- a/package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0592f8f829c843ff5cb2d108c309e32f4f6f5379 Mon Sep 17 00:00:00 2001 -From: Andre Przywara -Date: Thu, 1 Aug 2024 12:10:54 +0100 -Subject: remove wordsize.h inclusion (for musl compatibility) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The wordsize.h header file and the __WORDSIZE definition do not seem -to be universal, the musl libc for instance has the definition in a -different header file. This breaks compilation of kvmtool against musl. - -The two leading underscores suggest a compiler-internal symbol anyway, so -let's just remove that particular macro usage entirely, and replace it -with the number we really want: the size of a "long" type. - -Reported-by: J. Neuschäfer -Signed-off-by: Andre Przywara -Reviewed-by: Alexandru Elisei -Link: https://lore.kernel.org/r/20240801111054.818765-1-andre.przywara@arm.com -Signed-off-by: Will Deacon -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/commit/?id=0592f8f829c843ff5cb2d108c309e32f4f6f5379 -Signed-off-by: Thomas Perale ---- - include/linux/bitops.h | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/include/linux/bitops.h b/include/linux/bitops.h -index ae33922f..ee8fd560 100644 ---- a/include/linux/bitops.h -+++ b/include/linux/bitops.h -@@ -1,15 +1,13 @@ - #ifndef _KVM_LINUX_BITOPS_H_ - #define _KVM_LINUX_BITOPS_H_ - --#include -- - #include - #include - #include - --#define BITS_PER_LONG __WORDSIZE - #define BITS_PER_BYTE 8 --#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) -+#define BITS_PER_LONG (BITS_PER_BYTE * sizeof(long)) -+#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG) - - #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) - --- -cgit 1.2.3-korg - diff --git a/package/kvmtool/kvmtool.hash b/package/kvmtool/kvmtool.hash index 63bbb7167c..8df6f929df 100644 --- a/package/kvmtool/kvmtool.hash +++ b/package/kvmtool/kvmtool.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a8504d8b184cae4e65ff5555cc84a436f3fbbc832a8017e3ca59d997dd5581db kvmtool-4d2c017f41533b0e51e00f689050c26190a15318-git4.tar.gz +sha256 18841c414e82b405a0bd6f5c546bc088becd298c1145a2bac97563e699231925 kvmtool-1117dbc8ceb21abc6e8cd9861450695995852290-git4.tar.gz sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 7fec6643f8..f5637e5384 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVMTOOL_VERSION = 4d2c017f41533b0e51e00f689050c26190a15318 +KVMTOOL_VERSION = 1117dbc8ceb21abc6e8cd9861450695995852290 KVMTOOL_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git KVMTOOL_SITE_METHOD = git KVMTOOL_DEPENDENCIES = \