Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -2,7 +2,7 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
|
||||
bool
|
||||
# Only tested on these architectures
|
||||
default y if BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel \
|
||||
|| BR2_x86_64
|
||||
|| BR2_x86_64 || BR2_arm
|
||||
|
||||
comment "QEMU requires a toolchain with wchar, threads"
|
||||
depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
config BR2_PACKAGE_HOST_QEMU
|
||||
bool "host qemu"
|
||||
# So far, we only build the user mode emulation, so this list
|
||||
# of architecture dependencies only takes into account this
|
||||
# emulation mode.
|
||||
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 || \
|
||||
@@ -12,6 +11,31 @@ config BR2_PACKAGE_HOST_QEMU
|
||||
help
|
||||
QEMU is a generic and open source machine emulator and virtualizer.
|
||||
|
||||
This option builds a user emulator for your selected architecture.
|
||||
This option builds an emulator for your selected architecture.
|
||||
|
||||
http://www.qemu.org
|
||||
|
||||
if BR2_PACKAGE_HOST_QEMU
|
||||
|
||||
comment "Emulators selection"
|
||||
|
||||
config BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
|
||||
bool "Enable system emulation"
|
||||
help
|
||||
Enables the build of the system emulator, which allows to
|
||||
boot an entire system in Qemu.
|
||||
|
||||
config BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
|
||||
bool "Enable Linux user-land emulation"
|
||||
help
|
||||
Enables the build of the user-land emulator, which allows to
|
||||
run user-space applications.
|
||||
|
||||
config BR2_PACKAGE_HOST_QEMU_VDE2
|
||||
bool "VDE2 support"
|
||||
help
|
||||
Enables VDE2 support. VDE2 stands for Virtual Distributed
|
||||
Ethernet and can be used to create virtual switches to
|
||||
"plug" both physical and virtual machines in them.
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed, tarball verified with GPG signature
|
||||
sha256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 qemu-2.5.0.tar.bz2
|
||||
sha256 c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec qemu-2.6.0.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QEMU_VERSION = 2.5.0
|
||||
QEMU_VERSION = 2.6.0
|
||||
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
|
||||
QEMU_SITE = http://wiki.qemu.org/download
|
||||
QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
|
||||
@@ -23,7 +23,6 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p
|
||||
# arm arm
|
||||
# armeb armeb
|
||||
# bfin not supported
|
||||
# i386 i386
|
||||
# i486 i386
|
||||
# i586 i386
|
||||
# i686 i386
|
||||
@@ -62,9 +61,19 @@ endif
|
||||
ifeq ($(HOST_QEMU_ARCH),sh4aeb)
|
||||
HOST_QEMU_ARCH = sh4eb
|
||||
endif
|
||||
HOST_QEMU_TARGETS = $(HOST_QEMU_ARCH)-linux-user
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_QEMU),y)
|
||||
ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y)
|
||||
HOST_QEMU_TARGETS += $(HOST_QEMU_ARCH)-softmmu
|
||||
HOST_QEMU_OPTS += --enable-system --enable-fdt
|
||||
HOST_QEMU_DEPENDENCIES += host-dtc
|
||||
else
|
||||
HOST_QEMU_OPTS += --disable-system
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE),y)
|
||||
HOST_QEMU_TARGETS += $(HOST_QEMU_ARCH)-linux-user
|
||||
HOST_QEMU_OPTS += --enable-linux-user
|
||||
|
||||
HOST_QEMU_HOST_SYSTEM_TYPE = $(shell uname -s)
|
||||
ifneq ($(HOST_QEMU_HOST_SYSTEM_TYPE),Linux)
|
||||
$(error "qemu-user can only be used on Linux hosts")
|
||||
@@ -85,11 +94,20 @@ HOST_QEMU_COMPARE_VERSION = $(shell test $(HOST_QEMU_HOST_SYSTEM_VERSION) -ge $(
|
||||
# built with kernel headers that are older or the same as the kernel
|
||||
# version running on the host machine.
|
||||
#
|
||||
|
||||
ifeq ($(BR_BUILDING),y)
|
||||
ifneq ($(HOST_QEMU_COMPARE_VERSION),OK)
|
||||
$(error "Refusing to build qemu-user: target Linux version newer than host's.")
|
||||
endif
|
||||
endif
|
||||
endif # BR_BUILDING
|
||||
|
||||
else # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
|
||||
HOST_QEMU_OPTS += --disable-linux-user
|
||||
endif # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_QEMU_VDE2),y)
|
||||
HOST_QEMU_OPTS += --enable-vde
|
||||
HOST_QEMU_DEPENDENCIES += host-vde2
|
||||
endif
|
||||
|
||||
define HOST_QEMU_CONFIGURE_CMDS
|
||||
@@ -101,7 +119,8 @@ define HOST_QEMU_CONFIGURE_CMDS
|
||||
--host-cc="$(HOSTCC)" \
|
||||
--python=$(HOST_DIR)/usr/bin/python2 \
|
||||
--extra-cflags="$(HOST_CFLAGS)" \
|
||||
--extra-ldflags="$(HOST_LDFLAGS)"
|
||||
--extra-ldflags="$(HOST_LDFLAGS)" \
|
||||
$(HOST_QEMU_OPTS)
|
||||
endef
|
||||
|
||||
define HOST_QEMU_BUILD_CMDS
|
||||
|
||||
Reference in New Issue
Block a user