From bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 6 +++--- meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/meson') diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 7ddfccf2d6..f1746d2094 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -24,11 +24,11 @@ UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" inherit setuptools3 -RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" +RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources" -FILES_${PN} += "${datadir}/polkit-1" +FILES:${PN} += "${datadir}/polkit-1" -do_install_append () { +do_install:append () { # As per the same issue in the python recipe itself: # Unfortunately the following pyc files are non-deterministc due to 'frozenset' # being written without strict ordering, even with PYTHONHASHSEED = 0 diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb index 74e1a7104a..0e76cc78f8 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb @@ -13,7 +13,7 @@ SRC_URI += "file://meson-setup.py \ # real paths by meson-setup.sh when the SDK is extracted. # - Some overrides aren't needed, since the SDK injects paths that take care of # them. -do_install_append() { +do_install:append() { install -d ${D}${datadir}/meson cat >${D}${datadir}/meson/meson.cross.template <