Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
Pascal Vizeli
@@ -0,0 +1,37 @@
|
||||
From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Clark <christopher.w.clark@gmail.com>
|
||||
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 <christopher.clark6@baesystems.com>
|
||||
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
||||
Acked-by: Wei Liu <wei.liu2@citrix.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Tue, 28 Nov 2017 11:51:27 +0100
|
||||
Subject: [PATCH] memfd: fix configure test
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Recent glibc added memfd_create in sys/mman.h. This conflicts with
|
||||
the definition in util/memfd.c:
|
||||
|
||||
/builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
|
||||
|
||||
Fix the configure test, and remove the sys/memfd.h inclusion since the
|
||||
file actually does not exist---it is a typo in the memfd_create(2) man
|
||||
page.
|
||||
|
||||
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
[ Changes by AF:
|
||||
- Port the patch to the qemu-xen tree
|
||||
]
|
||||
Signed-off-by: Alistair Francis <alistair@alistair23.me>
|
||||
---
|
||||
Upstream status: commit 75e5b70e6b5
|
||||
|
||||
configure | 2 +-
|
||||
util/memfd.c | 4 +---
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 9c8aa5a98bd4..99ccc1725ace 100755
|
||||
--- a/tools/qemu-xen/configure
|
||||
+++ b/tools/qemu-xen/configure
|
||||
@@ -3923,7 +3923,7 @@ fi
|
||||
# check if memfd is supported
|
||||
memfd=no
|
||||
cat > $TMPC << EOF
|
||||
-#include <sys/memfd.h>
|
||||
+#include <sys/mman.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
diff --git a/util/memfd.c b/util/memfd.c
|
||||
index 4571d1aba866..412e94a405fc 100644
|
||||
--- a/tools/qemu-xen/util/memfd.c
|
||||
+++ b/tools/qemu-xen/util/memfd.c
|
||||
@@ -31,9 +31,7 @@
|
||||
|
||||
#include "qemu/memfd.h"
|
||||
|
||||
-#ifdef CONFIG_MEMFD
|
||||
-#include <sys/memfd.h>
|
||||
-#elif defined CONFIG_LINUX
|
||||
+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
|
||||
#include <sys/syscall.h>
|
||||
#include <asm/unistd.h>
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -20,7 +20,6 @@ config BR2_PACKAGE_XEN_HYPERVISOR
|
||||
config BR2_PACKAGE_XEN_TOOLS
|
||||
bool "Xen tools"
|
||||
depends on !BR2_STATIC_LIBS # dtc (libfdt)
|
||||
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||
depends on BR2_USE_WCHAR # libglib2
|
||||
select BR2_PACKAGE_DTC
|
||||
@@ -37,7 +36,6 @@ config BR2_PACKAGE_XEN_TOOLS
|
||||
The Xen tools can be accessed by the xl command.
|
||||
|
||||
comment "xen tools need a toolchain w/ wchar, threads, dynamic library"
|
||||
depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf xen-4.10.1.tar.gz
|
||||
sha256 826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643 xen-4.11.0.tar.gz
|
||||
sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XEN_VERSION = 4.10.1
|
||||
XEN_VERSION = 4.11.0
|
||||
XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
|
||||
XEN_LICENSE = GPL-2.0
|
||||
XEN_LICENSE_FILES = COPYING
|
||||
@@ -45,7 +45,7 @@ XEN_DEPENDENCIES += argp-standalone
|
||||
endif
|
||||
XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
|
||||
XEN_MAKE_OPTS += dist-tools
|
||||
XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl"
|
||||
XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl --disable-opengl"
|
||||
|
||||
define XEN_INSTALL_INIT_SYSV
|
||||
mv $(TARGET_DIR)/etc/init.d/xencommons $(TARGET_DIR)/etc/init.d/S50xencommons
|
||||
|
||||
Reference in New Issue
Block a user