package/xen: Bump Xen to 4.11.0 and backport a fix
PATCH 1/1 package/xen: Bump Xen to 4.11.0 and backport a fix
Bump the Xen package to the latest release and backport a fix from the Xen master brach.
This fixes autobuilder issue:
http://autobuild.buildroot.net/results/6e0d8e962e861a32f5bf2e5031ef51c25768f1f6/
--- ...rm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch | 37 +++++++++++++++++++ package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch
package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +37 -0
@@ -0,0 +1,37 @@ +From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001 +From: Christopher Clark <[email protected]> +Date: Thu, 16 Aug 2018 13:22:41 -0700 +Subject: [PATCH] libxl/arm: Fix build on arm64 + acpi w/ gcc 8.2 + +Add zero-padding to #defined ACPI table strings that are copied. +Provides sufficient characters to satisfy the length required to +fully populate the destination and prevent array-bounds warnings. +Add BUILD_BUG_ON sizeof checks for compile-time length checking. + +Signed-off-by: Christopher Clark <[email protected]> +Reviewed-by: Stefano Stabellini <[email protected]> +Acked-by: Wei Liu <[email protected]> +--- + tools/libxl/libxl_arm_acpi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c +index 636f724039..eeca1def06 100644 +--- a/tools/libxl/libxl_arm_acpi.c ++++ b/tools/libxl/libxl_arm_acpi.c +@@ -48,9 +48,9 @@ extern const unsigned char dsdt_anycpu_arm[]; + _hidden + extern const int dsdt_anycpu_arm_len; + +-#define ACPI_OEM_ID "Xen" +-#define ACPI_OEM_TABLE_ID "ARM" +-#define ACPI_ASL_COMPILER_ID "XL" ++#define ACPI_OEM_ID "Xen\0\0" ++#define ACPI_OEM_TABLE_ID "ARM\0\0\0\0" ++#define ACPI_ASL_COMPILER_ID "XL\0" + + enum { + RSDP, +-- +2.17.1 +
package/xen/xen.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 d5a944a34e47e9d52b2837f616821eb4a9514c8fd0955dcc723111dba499acd4 xen-4.10.2.tar.gz +sha256 826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643 xen-4.11.0.tar.gz sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING
package/xen/xen.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.10.2 +XEN_VERSION = 4.11.0 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING
Signature · 1 line
2.17.1
PATCH 1/1 package/xen: Bump Xen to 4.11.0 and backport a fix
Alistair,
Quoted 4 lines · Alistair Francis
Bump the Xen package to the latest release and backport a fix from the Xen master brach.
Good call on doing the bump, I didn't look close enough to see that would catch the patches[1][2] I sent and my [3] was a yocto reference to your patch below. I'll reject mine and provide my tested by on this set as it is a much cleaner fix.
I'd suggest splitting this patch into a two separate patches(unsure of others preference).
[1] https://patchwork.ozlabs.org/patch/999090/
[2] https://patchwork.ozlabs.org/patch/999089/
[3] https://patchwork.ozlabs.org/patch/999088/
Quoted 20 lines
This fixes autobuilder issue:
http://autobuild.buildroot.net/results/6e0d8e962e861a32f5bf2e5031ef51c25768f1f6/Signed-off-by Alistair Francis <[email protected]>--- ...rm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch | 37 +++++++++++++++++++ package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patchpackage/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +3
-0@@ -0,0 +1,37 @@ +From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001 +From: Christopher Clark <[email protected]> +Date: Thu, 16 Aug 2018 13:22:41 -0700
package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch line 13
Quoted 10 lines
package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +10
-0+Subject: [PATCH] libxl/arm: Fix build on arm64 + acpi w/ gcc 8.2 + +Add zero-padding to #defined ACPI table strings that are copied. +Provides sufficient characters to satisfy the length required to +fully populate the destination and prevent array-bounds warnings. +Add BUILD_BUG_ON sizeof checks for compile-time length checking. + +Signed-off-by: Christopher Clark <[email protected]> +Reviewed-by: Stefano Stabellini <[email protected]> +Acked-by: Wei Liu <[email protected]>
Missing your signed off
Quoted 53 lines
package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +24
-0+--- + tools/libxl/libxl_arm_acpi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c +index 636f724039..eeca1def06 100644 +--- a/tools/libxl/libxl_arm_acpi.c ++++ b/tools/libxl/libxl_arm_acpi.c +@@ -48,9 +48,9 @@ extern const unsigned char dsdt_anycpu_arm[]; + _hidden + extern const int dsdt_anycpu_arm_len; + +-#define ACPI_OEM_ID "Xen" +-#define ACPI_OEM_TABLE_ID "ARM" +-#define ACPI_ASL_COMPILER_ID "XL" ++#define ACPI_OEM_ID "Xen\0\0" ++#define ACPI_OEM_TABLE_ID "ARM\0\0\0\0" ++#define ACPI_ASL_COMPILER_ID "XL\0" + + enum { + RSDP, +-- +2.17.1 +package/xen/xen.hash +1
-1@@ -1,3 +1,3 @@ # Locally computed -sha256 d5a944a34e47e9d52b2837f616821eb4a9514c8fd0955dcc723111dba499acd4 xen-4.10.2.tar.gz +sha256 826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643 xen-4.11.0.tar.gz sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYINGpackage/xen/xen.mk +1
-2@@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.10.2 +XEN_VERSION = 4.11.0 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING --2.17.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 1/1 package/xen: Bump Xen to 4.11.0 and backport a fix
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Alistair,
Quoted 4 lines · Alistair Francis
Bump the Xen package to the latest release and backport a fix from the Xen master brach.
Good call on doing the bump, I didn't look close enough to see that would catch the patches[1][2] I sent and my [3] was a yocto reference to your patch below. I'll reject mine and provide my tested by on this set as it is a much cleaner fix.
Quoted 8 lines
I'd suggest splitting this patch into a two separate patches(unsure of others preference).
Tested-by Matt Weber <[email protected]>[1] https://patchwork.ozlabs.org/patch/999090/
[2] https://patchwork.ozlabs.org/patch/999089/
[3] https://patchwork.ozlabs.org/patch/999088/
Hmm, I was hessitating what to do. As we are past -rc1 it would be nicer to just fix build issues on 4.10.2 instead of bumping, but judging from the upstream patch series, more patches will be needed:
https://www.mail-archive.com/xen-devel at lists.xenproject.org/msg11467.html
I checked upstream, and these patches have still not made it to the 4.10.x series, so moving to 4.11.x for gcc 8 support is probably the cleanest solution after all.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/xen: Bump Xen to 4.11.0 and backport a fix
In reply to Matthew WeberQuoted 14 lines · Matthew Weber
Alistair,
Quoted 4 lines · Alistair Francis
Bump the Xen package to the latest release and backport a fix from the Xen master brach.
Good call on doing the bump, I didn't look close enough to see that would catch the patches[1][2] I sent and my [3] was a yocto reference to your patch below. I'll reject mine and provide my tested by on this set as it is a much cleaner fix.
Quoted 8 lines
I'd suggest splitting this patch into a two separate patches(unsure of others preference).
Tested-by Matt Weber <[email protected]>[1] https://patchwork.ozlabs.org/patch/999090/
[2] https://patchwork.ozlabs.org/patch/999089/
[3] https://patchwork.ozlabs.org/patch/999088/
Hey Matt,
Sorry, I didn't realise you had already tackled this problem. Had I know I would have been happy to use your patches. Although as Peter points out we might have needed to apply a few more.
Thanks for the tested by.
Alistair
Quoted 88 lines
Quoted 22 lines
This fixes autobuilder issue:
http://autobuild.buildroot.net/results/6e0d8e962e861a32f5bf2e5031ef51c25768f1f6/Signed-off-by Alistair Francis <[email protected]>--- ...rm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch | 37 +++++++++++++++++++ package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patchpackage/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +3
-0@@ -0,0 +1,37 @@ +From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001 +From: Christopher Clark <[email protected]> +Date: Thu, 16 Aug 2018 13:22:41 -0700package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch line 13
Quoted 10 lines
package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +10
-0+Subject: [PATCH] libxl/arm: Fix build on arm64 + acpi w/ gcc 8.2 + +Add zero-padding to #defined ACPI table strings that are copied. +Provides sufficient characters to satisfy the length required to +fully populate the destination and prevent array-bounds warnings. +Add BUILD_BUG_ON sizeof checks for compile-time length checking. + +Signed-off-by: Christopher Clark <[email protected]> +Reviewed-by: Stefano Stabellini <[email protected]> +Acked-by: Wei Liu <[email protected]>Missing your signed off
Quoted 53 lines
package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch new file +24
-0+--- + tools/libxl/libxl_arm_acpi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c +index 636f724039..eeca1def06 100644 +--- a/tools/libxl/libxl_arm_acpi.c ++++ b/tools/libxl/libxl_arm_acpi.c +@@ -48,9 +48,9 @@ extern const unsigned char dsdt_anycpu_arm[]; + _hidden + extern const int dsdt_anycpu_arm_len; + +-#define ACPI_OEM_ID "Xen" +-#define ACPI_OEM_TABLE_ID "ARM" +-#define ACPI_ASL_COMPILER_ID "XL" ++#define ACPI_OEM_ID "Xen\0\0" ++#define ACPI_OEM_TABLE_ID "ARM\0\0\0\0" ++#define ACPI_ASL_COMPILER_ID "XL\0" + + enum { + RSDP, +-- +2.17.1 +package/xen/xen.hash +1
-1@@ -1,3 +1,3 @@ # Locally computed -sha256 d5a944a34e47e9d52b2837f616821eb4a9514c8fd0955dcc723111dba499acd4 xen-4.10.2.tar.gz +sha256 826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643 xen-4.11.0.tar.gz sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYINGpackage/xen/xen.mk +1
-2@@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.10.2 +XEN_VERSION = 4.11.0 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING --2.17.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot