summaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-08-02 11:01:05 -0700
committerKhem Raj <raj.khem@gmail.com>2021-08-12 10:08:24 -0700
commit59d36c9832702989bfcca8a5af29fb2dff01efcc (patch)
treeb2b07d98cb22bc5241cde7403b6a15d99821318e /recipes-devtools
parent72f59d35816cd2be6159013e4d96d03abf7f1c4b (diff)
downloadmeta-freescale-59d36c9832702989bfcca8a5af29fb2dff01efcc.tar.gz
layer: Convert to new override syntax
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/cst/cst_git.bb6
-rw-r--r--recipes-devtools/qemu/qemu-qoriq_4.1.0.bb18
-rw-r--r--recipes-devtools/qemu/qemu.inc22
3 files changed, 23 insertions, 23 deletions
diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb
index 9091350b..71df0a35 100644
--- a/recipes-devtools/cst/cst_git.bb
+++ b/recipes-devtools/cst/cst_git.bb
@@ -5,10 +5,10 @@ LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" 5LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff"
6 6
7DEPENDS += "openssl cst-native" 7DEPENDS += "openssl cst-native"
8RDEPENDS_${PN} = "bash" 8RDEPENDS:${PN} = "bash"
9 9
10GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys" 10GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys"
11GENKEYS_class-native = "./gen_keys" 11GENKEYS:class-native = "./gen_keys"
12 12
13inherit kernel-arch 13inherit kernel-arch
14 14
@@ -38,5 +38,5 @@ do_install () {
38 fi 38 fi
39} 39}
40 40
41FILES_${PN}-dbg += "${bindir}/cst/.debug" 41FILES:${PN}-dbg += "${bindir}/cst/.debug"
42BBCLASSEXTEND = "native nativesdk" 42BBCLASSEXTEND = "native nativesdk"
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
33RDEPENDS_${PN}_class-target += "bash" 33RDEPENDS:${PN}:class-target += "bash"
34 34
35EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" 35EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
36EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" 36EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
37EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" 37EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
38 38
39do_install_append_class-nativesdk() { 39do_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"
59PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" 59PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm"
60 60
61PACKAGECONFIG[xkbcommon] = ",," 61PACKAGECONFIG[xkbcommon] = ",,"
62PACKAGECONFIG[libudev] = ",," 62PACKAGECONFIG[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"
6HOMEPAGE = "http://qemu.org" 6HOMEPAGE = "http://qemu.org"
7LICENSE = "GPLv2 & LGPLv2.1" 7LICENSE = "GPLv2 & LGPLv2.1"
8 8
9RDEPENDS_${PN}-ptest = "bash make" 9RDEPENDS:${PN}-ptest = "bash make"
10 10
11require qemu-targets.inc 11require qemu-targets.inc
12inherit pkgconfig ptest 12inherit pkgconfig ptest
@@ -45,14 +45,14 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
45 45
46SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" 46SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5"
47 47
48COMPATIBLE_HOST_mipsarchn32 = "null" 48COMPATIBLE_HOST:mipsarchn32 = "null"
49COMPATIBLE_HOST_mipsarchn64 = "null" 49COMPATIBLE_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
53DEBUG_BUILD = "0" 53DEBUG_BUILD = "0"
54 54
55do_install_append() { 55do_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
102B = "${WORKDIR}/build" 102B = "${WORKDIR}/build"
103 103
104EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" 104EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
105 105
106do_configure_prepend_class-native() { 106do_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!
130do_install_append() { 130do_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
150PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" 150PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+"
151PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" 151PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+"
152 152
153PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" 153PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
154PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," 154PACKAGECONFIG[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,,"
193PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," 193PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust,"
194PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," 194PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,,"
195 195
196INSANE_SKIP_${PN} = "arch" 196INSANE_SKIP:${PN} = "arch"
197 197
198FILES_${PN} += "${datadir}/icons" 198FILES:${PN} += "${datadir}/icons"