diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-08-02 11:01:05 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-12 10:08:24 -0700 |
commit | 59d36c9832702989bfcca8a5af29fb2dff01efcc (patch) | |
tree | b2b07d98cb22bc5241cde7403b6a15d99821318e /recipes-devtools/qemu | |
parent | 72f59d35816cd2be6159013e4d96d03abf7f1c4b (diff) | |
download | meta-freescale-59d36c9832702989bfcca8a5af29fb2dff01efcc.tar.gz |
layer: Convert to new override syntax
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/qemu')
-rw-r--r-- | recipes-devtools/qemu/qemu-qoriq_4.1.0.bb | 18 | ||||
-rw-r--r-- | recipes-devtools/qemu/qemu.inc | 22 |
2 files changed, 20 insertions, 20 deletions
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb b/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb index dfd7fdcf..26c78639 100644 --- a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb +++ b/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb | |||
@@ -25,18 +25,18 @@ python() { | |||
25 | pkgs = d.getVar('PACKAGES').split() | 25 | pkgs = d.getVar('PACKAGES').split() |
26 | for p in pkgs: | 26 | for p in pkgs: |
27 | if '-qoriq' in p: | 27 | if '-qoriq' in p: |
28 | d.appendVar('RPROVIDES_' + p, ' ' + p.replace('-qoriq', '')) | 28 | d.appendVar('RPROVIDES:' + p, ' ' + p.replace('-qoriq', '')) |
29 | d.appendVar('RCONFLICTS_' + p, ' ' + p.replace('-qoriq', '')) | 29 | d.appendVar('RCONFLICTS:' + p, ' ' + p.replace('-qoriq', '')) |
30 | d.appendVar('RREPLACES_' + p, ' ' + p.replace('-qoriq', '')) | 30 | d.appendVar('RREPLACES:' + p, ' ' + p.replace('-qoriq', '')) |
31 | } | 31 | } |
32 | 32 | ||
33 | RDEPENDS_${PN}_class-target += "bash" | 33 | RDEPENDS:${PN}:class-target += "bash" |
34 | 34 | ||
35 | EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" | 35 | EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" |
36 | EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" | 36 | EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" |
37 | EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" | 37 | EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" |
38 | 38 | ||
39 | do_install_append_class-nativesdk() { | 39 | do_install:append:class-nativesdk() { |
40 | ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} | 40 | ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} |
41 | } | 41 | } |
42 | 42 | ||
@@ -56,7 +56,7 @@ PACKAGECONFIG ??= " \ | |||
56 | fdt sdl kvm aio libusb vhost \ | 56 | fdt sdl kvm aio libusb vhost \ |
57 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ | 57 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ |
58 | " | 58 | " |
59 | PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" | 59 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm" |
60 | 60 | ||
61 | PACKAGECONFIG[xkbcommon] = ",," | 61 | PACKAGECONFIG[xkbcommon] = ",," |
62 | PACKAGECONFIG[libudev] = ",," | 62 | PACKAGECONFIG[libudev] = ",," |
diff --git a/recipes-devtools/qemu/qemu.inc b/recipes-devtools/qemu/qemu.inc index bf05da9a..532bcf6d 100644 --- a/recipes-devtools/qemu/qemu.inc +++ b/recipes-devtools/qemu/qemu.inc | |||
@@ -6,7 +6,7 @@ a variety of guest operating systems" | |||
6 | HOMEPAGE = "http://qemu.org" | 6 | HOMEPAGE = "http://qemu.org" |
7 | LICENSE = "GPLv2 & LGPLv2.1" | 7 | LICENSE = "GPLv2 & LGPLv2.1" |
8 | 8 | ||
9 | RDEPENDS_${PN}-ptest = "bash make" | 9 | RDEPENDS:${PN}-ptest = "bash make" |
10 | 10 | ||
11 | require qemu-targets.inc | 11 | require qemu-targets.inc |
12 | inherit pkgconfig ptest | 12 | inherit pkgconfig ptest |
@@ -45,14 +45,14 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | |||
45 | 45 | ||
46 | SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" | 46 | SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" |
47 | 47 | ||
48 | COMPATIBLE_HOST_mipsarchn32 = "null" | 48 | COMPATIBLE_HOST:mipsarchn32 = "null" |
49 | COMPATIBLE_HOST_mipsarchn64 = "null" | 49 | COMPATIBLE_HOST:mipsarchn64 = "null" |
50 | 50 | ||
51 | # Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html | 51 | # Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html |
52 | # upstream states qemu doesn't work without optimization | 52 | # upstream states qemu doesn't work without optimization |
53 | DEBUG_BUILD = "0" | 53 | DEBUG_BUILD = "0" |
54 | 54 | ||
55 | do_install_append() { | 55 | do_install:append() { |
56 | # Prevent QA warnings about installed ${localstatedir}/run | 56 | # Prevent QA warnings about installed ${localstatedir}/run |
57 | if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi | 57 | if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi |
58 | } | 58 | } |
@@ -101,9 +101,9 @@ export LIBTOOL="${HOST_SYS}-libtool" | |||
101 | 101 | ||
102 | B = "${WORKDIR}/build" | 102 | B = "${WORKDIR}/build" |
103 | 103 | ||
104 | EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" | 104 | EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3" |
105 | 105 | ||
106 | do_configure_prepend_class-native() { | 106 | do_configure:prepend:class-native() { |
107 | # Append build host pkg-config paths for native target since the host may provide sdl | 107 | # Append build host pkg-config paths for native target since the host may provide sdl |
108 | BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") | 108 | BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") |
109 | if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then | 109 | if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then |
@@ -127,7 +127,7 @@ do_install () { | |||
127 | # This will trigger a MMU access fault in the virtual CPU. With this change, | 127 | # This will trigger a MMU access fault in the virtual CPU. With this change, |
128 | # the qemu-mips works fine. | 128 | # the qemu-mips works fine. |
129 | # IMPORTANT: This piece needs to be removed once the root cause is fixed! | 129 | # IMPORTANT: This piece needs to be removed once the root cause is fixed! |
130 | do_install_append() { | 130 | do_install:append() { |
131 | if [ -e "${D}/${bindir}/qemu-mips" ]; then | 131 | if [ -e "${D}/${bindir}/qemu-mips" ]; then |
132 | create_wrapper ${D}/${bindir}/qemu-mips \ | 132 | create_wrapper ${D}/${bindir}/qemu-mips \ |
133 | QEMU_RESERVED_VA=0x0 | 133 | QEMU_RESERVED_VA=0x0 |
@@ -147,8 +147,8 @@ make_qemu_wrapper() { | |||
147 | } | 147 | } |
148 | 148 | ||
149 | # Disable kvm/virgl/mesa on targets that do not support it | 149 | # Disable kvm/virgl/mesa on targets that do not support it |
150 | PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" | 150 | PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" |
151 | PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" | 151 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" |
152 | 152 | ||
153 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" | 153 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" |
154 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," | 154 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," |
@@ -193,6 +193,6 @@ PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,," | |||
193 | PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," | 193 | PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," |
194 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," | 194 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," |
195 | 195 | ||
196 | INSANE_SKIP_${PN} = "arch" | 196 | INSANE_SKIP:${PN} = "arch" |
197 | 197 | ||
198 | FILES_${PN} += "${datadir}/icons" | 198 | FILES:${PN} += "${datadir}/icons" |