From 59d36c9832702989bfcca8a5af29fb2dff01efcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 11:01:05 -0700 Subject: layer: Convert to new override syntax Signed-off-by: Khem Raj --- recipes-devtools/cst/cst_git.bb | 6 +++--- recipes-devtools/qemu/qemu-qoriq_4.1.0.bb | 18 +++++++++--------- recipes-devtools/qemu/qemu.inc | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'recipes-devtools') 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" LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" DEPENDS += "openssl cst-native" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys" -GENKEYS_class-native = "./gen_keys" +GENKEYS:class-native = "./gen_keys" inherit kernel-arch @@ -38,5 +38,5 @@ do_install () { fi } -FILES_${PN}-dbg += "${bindir}/cst/.debug" +FILES:${PN}-dbg += "${bindir}/cst/.debug" BBCLASSEXTEND = "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() { pkgs = d.getVar('PACKAGES').split() for p in pkgs: if '-qoriq' in p: - d.appendVar('RPROVIDES_' + p, ' ' + p.replace('-qoriq', '')) - d.appendVar('RCONFLICTS_' + p, ' ' + p.replace('-qoriq', '')) - d.appendVar('RREPLACES_' + p, ' ' + p.replace('-qoriq', '')) + d.appendVar('RPROVIDES:' + p, ' ' + p.replace('-qoriq', '')) + d.appendVar('RCONFLICTS:' + p, ' ' + p.replace('-qoriq', '')) + d.appendVar('RREPLACES:' + p, ' ' + p.replace('-qoriq', '')) } -RDEPENDS_${PN}_class-target += "bash" +RDEPENDS:${PN}:class-target += "bash" -EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" -EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" +EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} } @@ -56,7 +56,7 @@ PACKAGECONFIG ??= " \ fdt sdl kvm aio libusb vhost \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" +PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm" PACKAGECONFIG[xkbcommon] = ",," 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" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -RDEPENDS_${PN}-ptest = "bash make" +RDEPENDS:${PN}-ptest = "bash make" require qemu-targets.inc inherit pkgconfig ptest @@ -45,14 +45,14 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" -COMPATIBLE_HOST_mipsarchn32 = "null" -COMPATIBLE_HOST_mipsarchn64 = "null" +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" # Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html # upstream states qemu doesn't work without optimization DEBUG_BUILD = "0" -do_install_append() { +do_install:append() { # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi } @@ -101,9 +101,9 @@ export LIBTOOL="${HOST_SYS}-libtool" B = "${WORKDIR}/build" -EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" +EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3" -do_configure_prepend_class-native() { +do_configure:prepend:class-native() { # Append build host pkg-config paths for native target since the host may provide sdl BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then @@ -127,7 +127,7 @@ do_install () { # This will trigger a MMU access fault in the virtual CPU. With this change, # the qemu-mips works fine. # IMPORTANT: This piece needs to be removed once the root cause is fixed! -do_install_append() { +do_install:append() { if [ -e "${D}/${bindir}/qemu-mips" ]; then create_wrapper ${D}/${bindir}/qemu-mips \ QEMU_RESERVED_VA=0x0 @@ -147,8 +147,8 @@ make_qemu_wrapper() { } # Disable kvm/virgl/mesa on targets that do not support it -PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" -PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" 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,," PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," -INSANE_SKIP_${PN} = "arch" +INSANE_SKIP:${PN} = "arch" -FILES_${PN} += "${datadir}/icons" +FILES:${PN} += "${datadir}/icons" -- cgit v1.2.3-54-g00ecf