diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu.inc')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 27e3a8e259..b63c643dd8 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -27,15 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
27 | file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \ | 27 | file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \ |
28 | file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ | 28 | file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ |
29 | file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ | 29 | file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ |
30 | file://0001-net-tulip-Restrict-DMA-engine-to-memories.patch \ | ||
31 | file://0001-contrib-vhost-user-blk-Replace-lseek64-with-lseek.patch \ | 30 | file://0001-contrib-vhost-user-blk-Replace-lseek64-with-lseek.patch \ |
32 | file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ | 31 | file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ |
33 | file://arm-cpreg-fix.patch \ | ||
34 | file://CVE-2022-3165.patch \ | ||
35 | " | 32 | " |
36 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 33 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
37 | 34 | ||
38 | SRC_URI[sha256sum] = "a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6" | 35 | SRC_URI[sha256sum] = "5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157" |
39 | 36 | ||
40 | SRC_URI:append:class-target = " file://cross.patch" | 37 | SRC_URI:append:class-target = " file://cross.patch" |
41 | SRC_URI:append:class-nativesdk = " file://cross.patch" | 38 | SRC_URI:append:class-nativesdk = " file://cross.patch" |
@@ -72,15 +69,16 @@ do_install_ptest() { | |||
72 | sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh | 69 | sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh |
73 | 70 | ||
74 | # Strip the paths from the QEMU variable, we can use PATH | 71 | # Strip the paths from the QEMU variable, we can use PATH |
75 | sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak | 72 | makfiles=$(find ${D}${PTEST_PATH} -name "*.mak") |
73 | sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" $makfiles | ||
76 | 74 | ||
77 | # Strip compiler flags as they break reproducibility | 75 | # Strip compiler flags as they break reproducibility |
78 | sed -i -e "s,^CC=.*,CC=gcc," \ | 76 | sed -i -e "s,^CC=.*,CC=gcc," \ |
79 | -e "s,^CCAS=.*,CCAS=gcc," \ | 77 | -e "s,^CCAS=.*,CCAS=gcc," \ |
80 | -e "s,^LD=.*,LD=ld," ${D}${PTEST_PATH}/tests/tcg/*.mak | 78 | -e "s,^LD=.*,LD=ld," $makfiles |
81 | 79 | ||
82 | # Update SRC_PATH variable to the right place on target | 80 | # Update SRC_PATH variable to the right place on target |
83 | sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" ${D}${PTEST_PATH}/tests/tcg/*.mak | 81 | sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" $makfiles |
84 | 82 | ||
85 | } | 83 | } |
86 | 84 | ||
@@ -200,7 +198,7 @@ PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" | |||
200 | PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" | 198 | PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" |
201 | PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" | 199 | PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" |
202 | PACKAGECONFIG[vde] = "--enable-vde,--disable-vde" | 200 | PACKAGECONFIG[vde] = "--enable-vde,--disable-vde" |
203 | PACKAGECONFIG[slirp] = "--enable-slirp=internal,--disable-slirp" | 201 | PACKAGECONFIG[slirp] = "--enable-slirp,--disable-slirp,libslirp" |
204 | PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi" | 202 | PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi" |
205 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," | 203 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," |
206 | 204 | ||