diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/meson | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-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/meson')
| -rw-r--r-- | meta/recipes-devtools/meson/meson.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb | 6 |
2 files changed, 6 insertions, 6 deletions
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<pver>\d+(\.\d+)+)\.tar" | |||
| 24 | 24 | ||
| 25 | inherit setuptools3 | 25 | inherit setuptools3 |
| 26 | 26 | ||
| 27 | RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" | 27 | RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources" |
| 28 | 28 | ||
| 29 | FILES_${PN} += "${datadir}/polkit-1" | 29 | FILES:${PN} += "${datadir}/polkit-1" |
| 30 | 30 | ||
| 31 | do_install_append () { | 31 | do_install:append () { |
| 32 | # As per the same issue in the python recipe itself: | 32 | # As per the same issue in the python recipe itself: |
| 33 | # Unfortunately the following pyc files are non-deterministc due to 'frozenset' | 33 | # Unfortunately the following pyc files are non-deterministc due to 'frozenset' |
| 34 | # being written without strict ordering, even with PYTHONHASHSEED = 0 | 34 | # 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 \ | |||
| 13 | # real paths by meson-setup.sh when the SDK is extracted. | 13 | # real paths by meson-setup.sh when the SDK is extracted. |
| 14 | # - Some overrides aren't needed, since the SDK injects paths that take care of | 14 | # - Some overrides aren't needed, since the SDK injects paths that take care of |
| 15 | # them. | 15 | # them. |
| 16 | do_install_append() { | 16 | do_install:append() { |
| 17 | install -d ${D}${datadir}/meson | 17 | install -d ${D}${datadir}/meson |
| 18 | cat >${D}${datadir}/meson/meson.cross.template <<EOF | 18 | cat >${D}${datadir}/meson/meson.cross.template <<EOF |
| 19 | [binaries] | 19 | [binaries] |
| @@ -47,10 +47,10 @@ EOF | |||
| 47 | install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson | 47 | install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | RDEPENDS_${PN} += "\ | 50 | RDEPENDS:${PN} += "\ |
| 51 | nativesdk-ninja \ | 51 | nativesdk-ninja \ |
| 52 | nativesdk-python3 \ | 52 | nativesdk-python3 \ |
| 53 | nativesdk-python3-setuptools \ | 53 | nativesdk-python3-setuptools \ |
| 54 | " | 54 | " |
| 55 | 55 | ||
| 56 | FILES_${PN} += "${datadir}/meson ${SDKPATHNATIVE}" | 56 | FILES:${PN} += "${datadir}/meson ${SDKPATHNATIVE}" |
