Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -1,60 +0,0 @@
|
||||
From 9672cccd64c446369b5649fe23d575917638be46 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Tue, 5 Feb 2019 15:07:43 +0100
|
||||
Subject: [PATCH] configure: improve usbfs check
|
||||
|
||||
The current check to test if usbfs support should be compiled or not
|
||||
solely relies on the presence of <linux/usbdevice_fs.h>, without
|
||||
actually checking that all definition used by Qemu are provided by
|
||||
this header file.
|
||||
|
||||
With sufficiently old kernel headers, <linux/usbdevice_fs.h> may be
|
||||
present, but some of the definitions needed by Qemu may not be
|
||||
available.
|
||||
|
||||
This commit improves the check by building a small program that
|
||||
actually tests whether the necessary definitions are available.
|
||||
|
||||
In addition, it fixes a bug where have_usbfs was set to "yes"
|
||||
regardless of the result of the test.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
configure | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 3d89870d99..799c8e3b08 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4266,10 +4266,25 @@ fi
|
||||
# check for usbfs
|
||||
have_usbfs=no
|
||||
if test "$linux_user" = "yes"; then
|
||||
- if check_include linux/usbdevice_fs.h; then
|
||||
+ cat > $TMPC << EOF
|
||||
+#include <linux/usbdevice_fs.h>
|
||||
+
|
||||
+#ifndef USBDEVFS_GET_CAPABILITIES
|
||||
+#error "USBDEVFS_GET_CAPABILITIES undefined"
|
||||
+#endif
|
||||
+
|
||||
+#ifndef USBDEVFS_DISCONNECT_CLAIM
|
||||
+#error "USBDEVFS_DISCONNECT_CLAIM undefined"
|
||||
+#endif
|
||||
+
|
||||
+int main(void)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+EOF
|
||||
+ if compile_prog "" ""; then
|
||||
have_usbfs=yes
|
||||
fi
|
||||
- have_usbfs=yes
|
||||
fi
|
||||
|
||||
# check for fallocate
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally computed, tarball verified with GPG signature
|
||||
sha256 6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc qemu-3.1.0.tar.xz
|
||||
sha256 d7c69fef3fb4bfbac99e3f2ac9fb8d6409db4faadf2e37337d544e3fdb4fde3a qemu-3.1.1.tar.xz
|
||||
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
|
||||
sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QEMU_VERSION = 3.1.0
|
||||
QEMU_VERSION = 3.1.1
|
||||
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
|
||||
QEMU_SITE = http://download.qemu.org
|
||||
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;
|
||||
# NOTE: there is no top-level license file for non-(L)GPL licenses;
|
||||
# the non-(L)GPL license texts are specified in the affected
|
||||
# individual source files.
|
||||
|
||||
@@ -257,8 +257,11 @@ HOST_QEMU_OPTS += --enable-vde
|
||||
HOST_QEMU_DEPENDENCIES += host-vde2
|
||||
endif
|
||||
|
||||
ifdef ($(BR2_PACKAGE_HOST_QEMU_VIRTFS),y)
|
||||
ifeq ($(BR2_PACKAGE_HOST_QEMU_VIRTFS),y)
|
||||
HOST_QEMU_OPTS += --enable-virtfs
|
||||
HOST_QEMU_DEPENDENCIES += host-libcap
|
||||
else
|
||||
HOST_QEMU_OPTS += --disable-virtfs
|
||||
endif
|
||||
|
||||
# Override CPP, as it expects to be able to call it like it'd
|
||||
|
||||
Reference in New Issue
Block a user