summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/qemu/qemu.inc
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu.inc')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 33a8baea7f..4de8a9098b 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -6,7 +6,7 @@ a variety of guest operating systems"
6HOMEPAGE = "http://qemu.org" 6HOMEPAGE = "http://qemu.org"
7LICENSE = "GPLv2 & LGPLv2.1" 7LICENSE = "GPLv2 & LGPLv2.1"
8 8
9RDEPENDS_${PN}-ptest = "bash" 9RDEPENDS:${PN}-ptest = "bash"
10 10
11require qemu-targets.inc 11require qemu-targets.inc
12inherit pkgconfig ptest 12inherit pkgconfig ptest
@@ -44,8 +44,8 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
44 44
45SRC_URI[sha256sum] = "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9" 45SRC_URI[sha256sum] = "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9"
46 46
47SRC_URI_append_class-target = " file://cross.patch" 47SRC_URI:append:class-target = " file://cross.patch"
48SRC_URI_append_class-nativesdk = " file://cross.patch" 48SRC_URI:append:class-nativesdk = " file://cross.patch"
49 49
50# Applies against virglrender < 0.6.0 and not qemu itself 50# Applies against virglrender < 0.6.0 and not qemu itself
51CVE_CHECK_WHITELIST += "CVE-2017-5957" 51CVE_CHECK_WHITELIST += "CVE-2017-5957"
@@ -58,14 +58,14 @@ CVE_CHECK_WHITELIST += "CVE-2007-0998"
58# https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 58# https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11
59CVE_CHECK_WHITELIST += "CVE-2018-18438" 59CVE_CHECK_WHITELIST += "CVE-2018-18438"
60 60
61COMPATIBLE_HOST_mipsarchn32 = "null" 61COMPATIBLE_HOST:mipsarchn32 = "null"
62COMPATIBLE_HOST_mipsarchn64 = "null" 62COMPATIBLE_HOST:mipsarchn64 = "null"
63 63
64# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html 64# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
65# upstream states qemu doesn't work without optimization 65# upstream states qemu doesn't work without optimization
66DEBUG_BUILD = "0" 66DEBUG_BUILD = "0"
67 67
68do_install_append() { 68do_install:append() {
69 # Prevent QA warnings about installed ${localstatedir}/run 69 # Prevent QA warnings about installed ${localstatedir}/run
70 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi 70 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
71} 71}
@@ -112,7 +112,7 @@ B = "${WORKDIR}/build"
112 112
113#EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" 113#EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3"
114 114
115do_configure_prepend_class-native() { 115do_configure:prepend:class-native() {
116 # Append build host pkg-config paths for native target since the host may provide sdl 116 # Append build host pkg-config paths for native target since the host may provide sdl
117 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") 117 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
118 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then 118 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
@@ -136,7 +136,7 @@ do_install () {
136# This will trigger a MMU access fault in the virtual CPU. With this change, 136# This will trigger a MMU access fault in the virtual CPU. With this change,
137# the qemu-mips works fine. 137# the qemu-mips works fine.
138# IMPORTANT: This piece needs to be removed once the root cause is fixed! 138# IMPORTANT: This piece needs to be removed once the root cause is fixed!
139do_install_append() { 139do_install:append() {
140 if [ -e "${D}/${bindir}/qemu-mips" ]; then 140 if [ -e "${D}/${bindir}/qemu-mips" ]; then
141 create_wrapper ${D}/${bindir}/qemu-mips \ 141 create_wrapper ${D}/${bindir}/qemu-mips \
142 QEMU_RESERVED_VA=0x0 142 QEMU_RESERVED_VA=0x0
@@ -156,8 +156,8 @@ make_qemu_wrapper() {
156} 156}
157 157
158# Disable kvm/virgl/mesa on targets that do not support it 158# Disable kvm/virgl/mesa on targets that do not support it
159PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" 159PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+"
160PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" 160PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+"
161 161
162PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" 162PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
163PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," 163PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr,"
@@ -203,6 +203,6 @@ PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttn
203PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," 203PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
204PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" 204PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
205 205
206INSANE_SKIP_${PN} = "arch" 206INSANE_SKIP:${PN} = "arch"
207 207
208FILES_${PN} += "${datadir}/icons" 208FILES:${PN} += "${datadir}/icons"