kvm-unit-tests: bump to kvm-unit-tests-20171020
PATCH 1/2 kvm-unit-tests: bump to kvm-unit-tests-20171020
--- DEVELOPERS | 3 +- ...ile-remove-Werror-to-avoid-build-failures.patch | 29 +++++++++--------- ...clock-be-explicit-about-mul-instruction-d.patch | 35 ---------------------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 2 +- 5 files changed, 19 insertions(+), 52 deletions(-) delete mode 100644 package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch
DEVELOPERS +2 -1
@@ -443,7 +443,7 @@ F: package/znc/ N: Cyril Bur <[email protected]> F: arch/Config.in.powerpc -F: package/kvm-unit-tests +F: package/kvm-unit-tests/ N: Dagg Stompler <[email protected]> F: package/libamcodec/
@@ -1084,6 +1084,7 @@ F: package/iperf/ F: package/iperf3/ F: package/iputils/ F: package/iw/ +F: package/kvm-unit-tests/ F: package/libcsv/ F: package/libcurl/ F: package/libfcgi/
package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +15 -14
@@ -1,26 +1,27 @@ -From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Mon, 20 Nov 2017 22:09:39 +0100 +From e9490197169d146060a26e96eca2901375d5cd5e Mon Sep 17 00:00:00 2001 +From: Matt Weber <[email protected]> +Date: Sat, 2 Dec 2017 21:24:30 -0600 Subject: [PATCH] Makefile: remove -Werror to avoid build failures -Signed-off-by: Thomas Petazzoni <[email protected]> +Refactoring of Thomas Petazzoni's original. + +Signed-off-by: Matthew Weber <[email protected]> --- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Makefile | 1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 16ce297..909498e 100644 +index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -45,7 +45,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - - CFLAGS += -g --CFLAGS += $(autodepend-flags) -Wall -Werror -+CFLAGS += $(autodepend-flags) -Wall +@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + COMMON_CFLAGS += -g $(autodepend-flags) + COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized + COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter +-COMMON_CFLAGS += -Werror frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") fnostack_protector := $(call cc-option, -fno-stack-protector, "") -- -2.13.6 +2.14.2
package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 022ae220d6e7b5bd064bc8698c271dca4dac7d8c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Mon, 8 May 2017 22:27:25 +0200 -Subject: [PATCH] x86/hyperv_clock: be explicit about mul instruction data size - -With gcc 4.7.2, the build fails with: - -x86/hyperv_clock.c: Assembler messages: -x86/hyperv_clock.c:21: Error: no instruction mnemonic suffix given and no register operands; can't size instruction - -In order to avoid this, make the mul instruction data size explicit by -adding the appropriate suffix. It operates on 64-bit data, so use -"mulq". - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - x86/hyperv_clock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/x86/hyperv_clock.c b/x86/hyperv_clock.c -index 8b1deba..6c4dd56 100644 ---- a/x86/hyperv_clock.c -+++ b/x86/hyperv_clock.c -@@ -19,7 +19,7 @@ static inline u64 scale_delta(u64 delta, u64 mul_frac) - u64 product, unused; - - __asm__ ( -- "mul %3" -+ "mulq %3" - : "=d" (product), "=a" (unused) : "1" (delta), "rm" ((u64)mul_frac) ); - - return product; --- -2.7.4 -
package/kvm-unit-tests/kvm-unit-tests.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed -sha256 ccb9ff17a2c7d6c7d50b4b71b87381181b45484187100ae5b1ac54d9d61e8666 kvm-unit-tests-95062c20790d82713bfa7475b61a4adef3f3645a.tar.gz +sha256 346c543de9e953db283072e1c591cab9d0eb775f7fb1fff3d7560f38bdf6bdf2 kvm-unit-tests-kvm-unit-tests-20171020.tar.gz
package/kvm-unit-tests/kvm-unit-tests.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 95062c20790d82713bfa7475b61a4adef3f3645a +KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git KVM_UNIT_TESTS_SITE_METHOD = git KVM_UNIT_TESTS_LICENSE = LGPL-2.0
Signature · 1 line
2.14.2
PATCH 2/2 kvmtool: bump to f77d646ba0
Commit used:
2017-11-03 16:19:58 +0000
irq.h: fix compilation error due to missing bool type
--- DEVELOPERS | 1 + .../kvmtool/0001-avoid-redefining-PAGE_SIZE.patch | 42 ---------- ...6-kvm-cpu.c-don-t-include-asm-msr-index.h.patch | 58 -------------- .../0003-use-poll.h-instead-of-sys-poll.h.patch | 33 -------- ...nd-use-C-library-provided-strlcpy-and-str.patch | 90 ---------------------- package/kvmtool/0005-Fix-call-to-connect.patch | 34 -------- package/kvmtool/kvmtool.hash | 2 +- package/kvmtool/kvmtool.mk | 2 +- 8 files changed, 3 insertions(+), 259 deletions(-) delete mode 100644 package/kvmtool/0001-avoid-redefining-PAGE_SIZE.patch delete mode 100644 package/kvmtool/0002-x86-kvm-cpu.c-don-t-include-asm-msr-index.h.patch delete mode 100644 package/kvmtool/0003-use-poll.h-instead-of-sys-poll.h.patch delete mode 100644 package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch delete mode 100644 package/kvmtool/0005-Fix-call-to-connect.patch
DEVELOPERS +1 -0
@@ -1085,6 +1085,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/
package/kvmtool/0001-avoid-redefining-PAGE_SIZE.patch deleted +0 -42
42 lines not on this page · raw message
package/kvmtool/0002-x86-kvm-cpu.c-don-t-include-asm-msr-index.h.patch deleted +0 -58
58 lines not on this page · raw message
package/kvmtool/0003-use-poll.h-instead-of-sys-poll.h.patch deleted +0 -33
@@ -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 -
package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch deleted +0 -90
90 lines not on this page · raw message
package/kvmtool/0005-Fix-call-to-connect.patch deleted +0 -34
@@ -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 -
package/kvmtool/kvmtool.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed -sha256 5633d8dd1542996108bf9b75c9f2cf6bf13fb27bfd453ec250b3e5405e85f6ac kvmtool-bed2bd9e1fbef5819090feeada7b86eed97ca5e2.tar.gz +sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz
package/kvmtool/kvmtool.mk +1 -1
@@ -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 = \
Signature · 1 line
2.14.2
PATCH 2/2 kvmtool: bump to f77d646ba0
Hello,
Quoted 5 lines · Matt Weber
Commit used:
2017-11-03 16:19:58 +0000
irq.h: fix compilation error due to missing bool typeSigned-off-by Matthew Weber <[email protected]>
This breaks the build:
LINK lkvm
x86_64-amd-linux-gnu-gcc: error: elf_x86_64: No such file or directory
x86_64-amd-linux-gnu-gcc: error: unrecognized command line option '-m'
make[2]: *** [Makefile:384: lkvm] Error 1
make[1]: *** [package/pkg-generic.mk:250: /home/thomas/projets/buildroot/output/build/kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e/.stamp_built] Error 2
make: *** [Makefile:79: _all] Error 2
With the following defconfig:
BR2_x86_64=y
BR2_x86_steamroller=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_KVMTOOL=y
# BR2_TARGET_ROOTFS_TAR is not set
Best regards,
Thomas Petazzoni
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 2/2 kvmtool: bump to f77d646ba0
Thomas,
On Dec 3, 2017 7:54 AM, "Thomas Petazzoni" <
[email protected]> wrote:
Hello,
Quoted 5 lines · Matt Weber
Commit used:
2017-11-03 16:19:58 +0000
irq.h: fix compilation error due to missing bool typeSigned-off-by Matthew Weber <[email protected]>
This breaks the build:
LINK lkvm
x86_64-amd-linux-gnu-gcc: error: elf_x86_64: No such file or directory
x86_64-amd-linux-gnu-gcc: error: unrecognized command line option '-m' make[2]: *** [Makefile:384: lkvm] Error 1
make[1]: *** [package/pkg-generic.mk:250: /home/thomas/projets/ buildroot/output/build/kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e/.stamp_built] Error 2
make: *** [Makefile:79: _all] Error 2
With the following defconfig:
BR2_x86_64=y
BR2_x86_steamroller=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_KVMTOOL=y
# BR2_TARGET_ROOTFS_TAR is not set
(Pardon the rich text, just have my tablet this morning)
I forgot to run both of the kvm updates through testpkg, so I'll do that and take a look at this one.
Matt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171203/f2167b02/attachment.html>
PATCH 2/2 kvmtool: bump to f77d646ba0
Hello,
Quoted 4 lines · Matthew Weber
(Pardon the rich text, just have my tablet this morning)
I forgot to run both of the kvm updates through testpkg, so I'll do that and take a look at this one.
No problem. I don't always do a test build before pushing version bumps, because I rely on the autobuilders to do such testing. But sometimes I do a quick build test, which was the case here, and it found an issue :-)
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 2/2 kvmtool: bump to f77d646ba0
In reply to Matthew WeberGustavo,
Quoted 12 lines · Matthew Weber
Thomas,
On Dec 3, 2017 7:54 AM, "Thomas Petazzoni" <[email protected]> wrote:
Hello,
Quoted 4 lines · Matt Weber
Commit used:
2017-11-03 16:19:58 +0000
irq.h: fix compilation error due to missing bool type
Quoted 6 lines
Quoted 1 line
Signed-off-by Matthew Weber <[email protected]>This breaks the build:
LINK lkvm
x86_64-amd-linux-gnu-gcc: error:elf_x86_64: No such file or directory
Gustavo, the latest kvmtool switched to doing the final link with gcc vs originally ld. I believe this is the right fix.
3 --- a/package/kvmtool/kvmtool.mk
4 +++ b/package/kvmtool/kvmtool.mk
5 @@ -33,7 +33,7 @@ KVMTOOL_LICENSE_FILES = COPYING
6 # If more packages need this (unlikely) an ld wrapper might be a better
7 # solution, using gcc -dumpspecs information.
8 KVMTOOL_EXTRA_LDFLAGS = \
9 - $(if $(BR2_x86_64),-m elf_x86_64)
10 + $(if $(BR2_x86_64),-m64)
11
12 # Disable -Werror, otherwise musl is not happy
13 KVMTOOL_MAKE_OPTS = \Quoted 7 lines
x86_64-amd-linux-gnu-gcc: error: unrecognized command line option '-m'
make[2]: *** [Makefile:384: lkvm] Error 1
make[1]: *** [package/pkg-generic.mk:250:/home/thomas/projets/buildroot/output/build/kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e/.stamp_built] Error 2
make: *** [Makefile:79:_all] Error 2With the following defconfig:
Quoted 9 lines
BR2_x86_64=y
BR2_x86_steamroller=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
#BR2_PACKAGE_BUSYBOXis not set
BR2_PACKAGE_KVMTOOL=y
#BR2_TARGET_ROOTFS_TARis not set
Matt
PATCH 2/2 kvmtool: bump to f77d646ba0
Hello,
Quoted 11 lines · Matthew Weber
Gustavo, the latest kvmtool switched to doing the final link with gcc vs originally ld. I believe this is the right fix.
3 ---
a/package/kvmtool/kvmtool.mk
4 +++b/package/kvmtool/kvmtool.mk
5 @@ -33,7 +33,7 @@KVMTOOL_LICENSE_FILES= COPYING
6 # If more packages need this (unlikely) an ld wrapper might be a better 7 # solution, using gcc -dumpspecs information.
8KVMTOOL_EXTRA_LDFLAGS= \
9 - $(if $(BR2_x86_64),-melf_x86_64)
10 + $(if $(BR2_x86_64),-m64)
If kvmtool is now building with gcc, do we need -m64 at all ?
Also Matt: I wouldn't expect much feedback from Gustavo, he has stopped contributing to Buildroot earlier this year, and has removed himself from the DEVELOPERS file.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 2/2 kvmtool: bump to f77d646ba0
Thomas,
Quoted 17 lines · Thomas Petazzoni
Hello,
Quoted 11 lines · Matthew Weber
Gustavo, the latest kvmtool switched to doing the final link with gcc vs originally ld. I believe this is the right fix.
3 ---
a/package/kvmtool/kvmtool.mk
4 +++b/package/kvmtool/kvmtool.mk
5 @@ -33,7 +33,7 @@KVMTOOL_LICENSE_FILES= COPYING
6 # If more packages need this (unlikely) an ld wrapper might be a better 7 # solution, using gcc -dumpspecs information.
8KVMTOOL_EXTRA_LDFLAGS= \
9 - $(if $(BR2_x86_64),-melf_x86_64)
10 + $(if $(BR2_x86_64),-m64)
Quoted 2 lines
If kvmtool is now building with gcc, do we need -m64 at all ?
That's true, gcc would already be assuming m64 based on the target's arch vs the linker wouldn't have been able to infer that. I'll remove and kickoff a test.
Quoted 3 lines
Also Matt: I wouldn't expect much feedback from Gustavo, he has stopped contributing to Buildroot earlier this year, and has removed himself from the DEVELOPERS file.
Noted.
PATCH 2/2 kvmtool: bump to f77d646ba0
Thomas,
Quoted 21 lines · Matthew Weber
Thomas,
Quoted 17 lines · Thomas Petazzoni
Hello,
Quoted 11 lines · Matthew Weber
Gustavo, the latest kvmtool switched to doing the final link with gcc vs originally ld. I believe this is the right fix.
3 ---
a/package/kvmtool/kvmtool.mk
4 +++b/package/kvmtool/kvmtool.mk
5 @@ -33,7 +33,7 @@KVMTOOL_LICENSE_FILES= COPYING
6 # If more packages need this (unlikely) an ld wrapper might be a better 7 # solution, using gcc -dumpspecs information.
8KVMTOOL_EXTRA_LDFLAGS= \
9 - $(if $(BR2_x86_64),-melf_x86_64)
10 + $(if $(BR2_x86_64),-m64)
Quoted 7 lines
Quoted 2 lines
If kvmtool is now building with gcc, do we need -m64 at all ?
That's true, gcc would already be assuming m64 based on the target's arch vs the linker wouldn't have been able to infer that. I'll remove and kickoff a test.
Verified, test-pkg now passes and so does your test config. Will send a v2.
Matt
PATCH 2/2 kvmtool: bump to f77d646ba0
Thomas,
Quoted 2 lines · Matthew Weber
Thomas,
Superseded by : https://patchwork.ozlabs.org/patch/845420/
PATCH 1/2 kvm-unit-tests: bump to kvm-unit-tests-20171020
In reply to Matt WeberHello,
Quoted 1 line · Matt Weber
Signed-off-by Matthew Weber <[email protected]>
A better commit log would have been:
kvm-unit-tests: bump to kvm-unit-tests-20171020
- 0001-Makefile-remove-Werror-to-avoid-build-failures.patch is adjusted to apply to the new version of kvm-unit-tests
- 0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch is removed, as it has been merged upstream as of commit 45276b5860522921c77fb3ccc1458ff5f223c3c6.
DEVELOPERS F: package/znc/ · line 446
Quoted 10 lines
DEVELOPERS +1
-1@@ -443,7 +443,7 @@ F: package/znc/ N: Cyril Bur <[email protected]> F: arch/Config.in.powerpc -F: package/kvm-unit-tests +F: package/kvm-unit-tests/
Change is not related, should have been in a separate patch, so I've removed it before applying.
package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch line 3
Quoted 11 lines
package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +3
-3@@ -1,26 +1,27 @@ -From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Mon, 20 Nov 2017 22:09:39 +0100 +From e9490197169d146060a26e96eca2901375d5cd5e Mon Sep 17 00:00:00 2001 +From: Matt Weber <[email protected]> +Date: Sat, 2 Dec 2017 21:24:30 -0600
No reason to change the author of the patch here...
package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch line 6
Quoted 3 lines
package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +0
-1Subject: [PATCH] Makefile: remove -Werror to avoid build failures -Signed-off-by: Thomas Petazzoni <[email protected]>
... and to drop the SoB.
I've applied to master after fixing those issues.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com