kvmtool: bump to f77d646ba0

index 0bbee2c369..51baa81918 100644
@@ -1089,6 +1089,7 @@ F:	package/iperf3/
 F:	package/iputils/
 F:	package/iw/
 F:	package/kvm-unit-tests/
+F:	package/kvmtool/
 F:	package/libcsv/
 F:	package/libcurl/
 F:	package/libfcgi/

42 lines not on this page · raw message

58 lines not on this page · raw message

deleted file mode 100644
index a358569b67..0000000000
@@ -1,33 +0,0 @@
-From 19490e24895df95253e43a7aacf3ef408b830bd5 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <[email protected]>
-Date: Fri, 17 Jul 2015 17:02:15 +0100
-Subject: [PATCH] use <poll.h> instead of <sys/poll.h>
-
-The manpage of poll(2) states that the prototype of poll is defined
-in <poll.h>. Use that header file instead of <sys/poll.h> to allow
-compilation against musl-libc.
-
-Signed-off-by: Andre Przywara <[email protected]>
-Signed-off-by: Will Deacon <[email protected]>
-[backport from upstream commit 52c22e6e64a94cc701d86587d32cd3822ac5c293.]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- disk/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/disk/core.c b/disk/core.c
-index 309e16c..dd2f258 100644
---- a/disk/core.c
-+++ b/disk/core.c
-@@ -5,7 +5,7 @@
- 
- #include <linux/err.h>
- #include <sys/eventfd.h>
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #define AIO_MAX 256
- 
--- 
-2.9.4
-

90 lines not on this page · raw message

deleted file mode 100644
index 434ca34b2f..0000000000
@@ -1,34 +0,0 @@
-From d375235f49184371026791ae8f6f9dc307de8a61 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <[email protected]>
-Date: Fri, 17 Jul 2015 17:02:14 +0100
-Subject: [PATCH] Fix call to connect()
-
-According to the manpage and the prototype the second argument to
-connect(2) is a "const struct sockaddr*", so cast our protocol
-specific type back to the super type.
-This fixes compilation on musl-libc.
-
-Signed-off-by: Andre Przywara <[email protected]>
-Signed-off-by: Will Deacon <[email protected]>
-[backport from upstream commit d77bd4f466f341d4b35fe8b91176ef8a37160e19.]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- kvm-ipc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kvm-ipc.c b/kvm-ipc.c
-index b1c43dd..5a0b6e0 100644
---- a/kvm-ipc.c
-+++ b/kvm-ipc.c
-@@ -99,7 +99,7 @@ int kvm__get_sock_by_instance(const char *name)
- 	strlcpy(local.sun_path, sock_file, sizeof(local.sun_path));
- 	len = strlen(local.sun_path) + sizeof(local.sun_family);
- 
--	r = connect(s, &local, len);
-+	r = connect(s, (struct sockaddr *)&local, len);
- 	if (r < 0 && errno == ECONNREFUSED) {
- 		/* Tell the user clean ghost socket file */
- 		pr_err("\"%s\" could be a ghost socket file, please remove it",
--- 
-2.9.4
-

index 657fdb315e..428277354d 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 5633d8dd1542996108bf9b75c9f2cf6bf13fb27bfd453ec250b3e5405e85f6ac  kvmtool-bed2bd9e1fbef5819090feeada7b86eed97ca5e2.tar.gz
+sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc  kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz

index 2789a6e308..5894e4771d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KVMTOOL_VERSION = bed2bd9e1fbef5819090feeada7b86eed97ca5e2
+KVMTOOL_VERSION = f77d646ba01d04be5aad9449ac00719c043fe36e
 KVMTOOL_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/will/kvmtool.git
 KVMTOOL_SITE_METHOD = git
 KVMTOOL_DEPENDENCIES = \

@@ -18,23 +18,6 @@ KVMTOOL_DEPENDENCIES = \
 KVMTOOL_LICENSE = GPL-2.0
 KVMTOOL_LICENSE_FILES = COPYING
 
-# This is required to convert a static binary (init helper) back into
-# object-file format, and in multilib toolchains like CS 2012.09 for x86
-# the default is i386, hence when building for x86_64 things break since
-# LD doesn't autodetect the input file format.
-# GCC-as-linker can't accomplish this feat easily either since it's mixing
-# static content (guest_init.o) with dynamic one (lkvm) making
-# a relocatable output file.
-# The purpose of this trick is to embed the init helper into the main
-# binary to help users in guest system startup, which would otherwise
-# require more complex guest images.
-# This needs revisiting if/when X32 ABI support is added.
-#
-# If more packages need this (unlikely) an ld wrapper might be a better
-# solution, using gcc -dumpspecs information.
-KVMTOOL_EXTRA_LDFLAGS = \
-	$(if $(BR2_x86_64),-m elf_x86_64)
-
 # Disable -Werror, otherwise musl is not happy
 KVMTOOL_MAKE_OPTS = \
 	CROSS_COMPILE="$(TARGET_CROSS)" \