summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksiy Obitotskyy <oobitots@cisco.com>2020-03-30 05:47:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-31 13:58:01 +0100
commit62d944d31e33d2a4697d3eaf39633b0523bae45c (patch)
tree4e02bf3db41a29705926e9cb46295c5f9fa69ff1
parent05cb3a2f58a89b90bf69f8f7bfef461f3c647fd2 (diff)
downloadpoky-62d944d31e33d2a4697d3eaf39633b0523bae45c.tar.gz
qemu: Add check for missing header
Header missing and configure script detect this. Add check before include header (if_alg.h). (From OE-Core rev: ab2cbfc902626d40897426bf734c7507e57ba629) Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch31
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 972767615d..530ee82fa9 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -35,6 +35,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
35 file://CVE-2020-7039-3.patch \ 35 file://CVE-2020-7039-3.patch \
36 file://0001-Add-enable-disable-udev.patch \ 36 file://0001-Add-enable-disable-udev.patch \
37 file://CVE-2020-7211.patch \ 37 file://CVE-2020-7211.patch \
38 file://0001-qemu-Do-not-include-file-if-not-exists.patch \
38 " 39 "
39UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 40UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
40 41
diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch
new file mode 100644
index 0000000000..eccac0509c
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch
@@ -0,0 +1,31 @@
1From 98c2da129db19ee63d7e21b77a0ef70822c95069 Mon Sep 17 00:00:00 2001
2From: Oleksiy Obitotskyy <oobitots@cisco.com>
3Date: Wed, 25 Mar 2020 21:21:35 +0200
4Subject: [PATCH] qemu: Do not include file if not exists
5
6Script configure checks for if_alg.h and check failed but
7if_alg.h still included.
8
9Upstream-status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg07188.html]
10Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
11---
12 linux-user/syscall.c | 2 ++
13 1 file changed, 2 insertions(+)
14
15diff --git a/linux-user/syscall.c b/linux-user/syscall.c
16index fc18f244..68d62666 100644
17--- a/linux-user/syscall.c
18+++ b/linux-user/syscall.c
19@@ -106,7 +106,9 @@
20 #include <linux/blkpg.h>
21 #include <netpacket/packet.h>
22 #include <linux/netlink.h>
23+#if defined(CONFIG_AF_ALG)
24 #include <linux/if_alg.h>
25+#endif
26 #include "linux_loop.h"
27 #include "uname.h"
28
29--
302.20.1
31