rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
bsp/buildroot/package/qemu/0002-memfd-fix-configure-test.patch Normal file
View File

@@ -0,0 +1,58 @@
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>
---
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/configure
+++ b/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/util/memfd.c
+++ b/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

42
bsp/buildroot/package/qemu/Config.in
View File

@@ -20,18 +20,20 @@ config BR2_PACKAGE_QEMU
select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_ZLIB
help
QEMU is a generic and open source machine emulator and virtualizer.
QEMU is a generic and open source machine emulator and
virtualizer.
When used as a machine emulator, QEMU can run OSes and programs made
for one machine (e.g. an ARM board) on a different machine (e.g.
your own PC). By using dynamic translation, it achieves very good
performance.
When used as a machine emulator, QEMU can run OSes and
programs made for one machine (e.g. an ARM board) on a
different machine (e.g. your own PC). By using dynamic
translation, it achieves very good performance.
When used as a virtualizer, QEMU achieves near native performances
by executing the guest code directly on the host CPU. QEMU supports
virtualization when executing under the Xen hypervisor or using the
KVM kernel module in Linux. When using KVM, QEMU can virtualize x86,
server and embedded PowerPC, and S390 guests.
When used as a virtualizer, QEMU achieves near native
performances by executing the guest code directly on the
host CPU. QEMU supports virtualization when executing under
the Xen hypervisor or using the KVM kernel module in
Linux. When using KVM, QEMU can virtualize x86, server and
embedded PowerPC, and S390 guests.
http://qemu.org/
@@ -42,7 +44,8 @@ comment "Emulators selection"
config BR2_PACKAGE_QEMU_CUSTOM_TARGETS
string "Enable specific targets"
help
Enter here the list of QEMU targets you want to build. For example:
Enter here the list of QEMU targets you want to build. For
example:
System emulation | User-land emulation
----------------------+-----------------------
@@ -63,7 +66,8 @@ config BR2_PACKAGE_QEMU_SYSTEM
depends on !BR2_STATIC_LIBS # dtc
select BR2_PACKAGE_QEMU_FDT
help
Say 'y' to build all system emulators/virtualisers that QEMU supports.
Say 'y' to build all system emulators/virtualisers that QEMU
supports.
comment "systems emulation needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
@@ -73,7 +77,8 @@ config BR2_PACKAGE_QEMU_LINUX_USER
# Incompatible "struct sigevent" definition on musl
depends on !BR2_TOOLCHAIN_USES_MUSL
help
Say 'y' to build all Linux user-land emulators that QEMU supports.
Say 'y' to build all Linux user-land emulators that QEMU
supports.
# Note: bsd-user can not be build on Linux
@@ -94,8 +99,8 @@ config BR2_PACKAGE_QEMU_SDL
bool "Enable SDL frontend"
select BR2_PACKAGE_SDL
help
Say 'y' to enable the SDL frontend, that is, a graphical window
presenting the VM's display.
Say 'y' to enable the SDL frontend, that is, a graphical
window presenting the VM's display.
comment "Misc. features"
@@ -104,8 +109,8 @@ config BR2_PACKAGE_QEMU_FDT
depends on !BR2_STATIC_LIBS # dtc
select BR2_PACKAGE_DTC
help
Say 'y' here to have QEMU capable of constructing Device Trees,
and passing them to the VMs.
Say 'y' here to have QEMU capable of constructing Device
Trees, and passing them to the VMs.
comment "FDT support needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
@@ -115,6 +120,7 @@ endif # BR2_PACKAGE_QEMU_HAS_EMULS
config BR2_PACKAGE_QEMU_TOOLS
bool "Enable tools"
help
Say 'y' here to include tools packaged with QEMU (e.g. qemu-img).
Say 'y' here to include tools packaged with QEMU
(e.g. qemu-img).
endif # BR2_PACKAGE_QEMU

7
bsp/buildroot/package/qemu/Config.in.host
View File

@@ -1,15 +1,16 @@
config BR2_PACKAGE_HOST_QEMU
bool "host qemu"
select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
depends on BR2_arm || BR2_armeb || BR2_aarch64 || \
BR2_i386 || BR2_m68k || BR2_microblazeel || \
BR2_microblazebe || BR2_mips || BR2_mipsel || \
BR2_mips64 || BR2_mips64el || BR2_powerpc || \
BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \
BR2_sparc || BR2_x86_64
select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
help
QEMU is a generic and open source machine emulator and virtualizer.
QEMU is a generic and open source machine emulator and
virtualizer.
This option builds an emulator for your selected architecture.

4
bsp/buildroot/package/qemu/qemu.hash
View File

@@ -1,2 +1,4 @@
# Locally computed, tarball verified with GPG signature
sha256 7b50634d729dcabe4a96d74062832274fa2f4c883e82904f5e6955f801edab54 qemu-2.8.1.1.tar.xz
sha256 fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f qemu-2.10.2.tar.xz
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB

92
bsp/buildroot/package/qemu/qemu.mk
View File

@@ -4,10 +4,10 @@
#
################################################################################
QEMU_VERSION = 2.8.1.1
QEMU_VERSION = 2.10.2
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
QEMU_SITE = http://download.qemu.org
QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
QEMU_LICENSE_FILES = COPYING COPYING.LIB
# NOTE: there is no top-level license file for non-(L)GPL licenses;
# the non-(L)GPL license texts are specified in the affected
@@ -126,11 +126,11 @@ define HOST_QEMU_CONFIGURE_CMDS
cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \
./configure \
--target-list="$(HOST_QEMU_TARGETS)" \
--prefix="$(HOST_DIR)/usr" \
--prefix="$(HOST_DIR)" \
--interp-prefix=$(STAGING_DIR) \
--cc="$(HOSTCC)" \
--host-cc="$(HOSTCC)" \
--python=$(HOST_DIR)/usr/bin/python2 \
--python=$(HOST_DIR)/bin/python2 \
--extra-cflags="$(HOST_CFLAGS)" \
--extra-ldflags="$(HOST_LDFLAGS)" \
$(HOST_QEMU_OPTS)
@@ -147,7 +147,7 @@ endef
$(eval $(host-generic-package))
# variable used by other packages
QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)
QEMU_USER = $(HOST_DIR)/bin/qemu-$(HOST_QEMU_ARCH)
#-------------------------------------------------------------
# Target-qemu
@@ -161,8 +161,8 @@ QEMU_LIBS = -lrt -lm
QEMU_OPTS =
QEMU_VARS = \
LIBTOOL=$(HOST_DIR)/usr/bin/libtool \
PYTHON=$(HOST_DIR)/usr/bin/python2 \
LIBTOOL=$(HOST_DIR)/bin/libtool \
PYTHON=$(HOST_DIR)/bin/python2 \
PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
# If we want to specify only a subset of targets, we must still enable all
@@ -212,45 +212,51 @@ else
QEMU_OPTS += --disable-tools
endif
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
QEMU_OPTS += --enable-libssh2
QEMU_DEPENDENCIES += libssh2
else
QEMU_OPTS += --disable-libssh2
endif
# Override CPP, as it expects to be able to call it like it'd
# call the compiler.
define QEMU_CONFIGURE_CMDS
( cd $(@D); \
LIBS='$(QEMU_LIBS)' \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CPP="$(TARGET_CC) -E" \
$(QEMU_VARS) \
./configure \
--prefix=/usr \
--cross-prefix=$(TARGET_CROSS) \
--with-system-pixman \
--audio-drv-list= \
--enable-kvm \
--enable-attr \
--enable-vhost-net \
--disable-bsd-user \
--disable-xen \
--disable-slirp \
--disable-vnc \
--disable-virtfs \
--disable-brlapi \
--disable-curses \
--disable-curl \
--disable-bluez \
--disable-uuid \
--disable-vde \
--disable-linux-aio \
--disable-cap-ng \
--disable-docs \
--disable-spice \
--disable-rbd \
--disable-libiscsi \
--disable-usb-redir \
--disable-strip \
--disable-seccomp \
--disable-sparse \
$(QEMU_OPTS) \
( cd $(@D); \
LIBS='$(QEMU_LIBS)' \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CPP="$(TARGET_CC) -E" \
$(QEMU_VARS) \
./configure \
--prefix=/usr \
--cross-prefix=$(TARGET_CROSS) \
--with-system-pixman \
--audio-drv-list= \
--enable-kvm \
--enable-attr \
--enable-vhost-net \
--disable-bsd-user \
--disable-xen \
--disable-slirp \
--disable-vnc \
--disable-virtfs \
--disable-brlapi \
--disable-curses \
--disable-curl \
--disable-bluez \
--disable-vde \
--disable-linux-aio \
--disable-cap-ng \
--disable-docs \
--disable-spice \
--disable-rbd \
--disable-libiscsi \
--disable-usb-redir \
--disable-strip \
--disable-seccomp \
--disable-sparse \
$(QEMU_OPTS) \
)
endef