diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-28 14:22:43 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-08-02 17:17:53 -0400 |
| commit | d876cfc5bfafa516dee55d04b50b319a22165640 (patch) | |
| tree | ea03c34f999bd85e440c85fc8e722df8666e2e68 /recipes-devtools/python | |
| parent | 5fdf66c1e2ec0c6b08573bf0a6aa9f84d2fc4ae6 (diff) | |
| download | meta-virtualization-d876cfc5bfafa516dee55d04b50b319a22165640.tar.gz | |
global: overrides syntax conversion
OEcore/bitbake are moving to use the clearer ":" as an overrides
separator.
This is pass one of updating the meta-virt recipes to use that
syntax.
This has only been minimally build/runtime tested, more changes
will be required for missed overrides, or incorrect conversions
Note: A recent bitbake is required:
commit 75fad23fc06c008a03414a1fc288a8614c6af9ca
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun Jul 18 12:59:15 2021 +0100
bitbake: data_smart/parse: Allow ':' characters in variable/function names
It is becomming increasingly clear we need to find a way to show what
is/is not an override in our syntax. We need to do this in a way which
is clear to users, readable and in a way we can transition to.
The most effective way I've found to this is to use the ":" charater
to directly replace "_" where an override is being specified. This
includes "append", "prepend" and "remove" which are effectively special
override directives.
This patch simply adds the character to the parser so bitbake accepts
the value but maps it back to "_" internally so there is no behaviour
change.
This change is simple enough it could potentially be backported to older
version of bitbake meaning layers using the new syntax/markup could
work with older releases. Even if other no other changes are accepted
at this time and we don't backport, it does set us on a path where at
some point in future we could
require a more explict syntax.
I've tested this patch by converting oe-core/meta-yocto to the new
syntax for overrides (9000+ changes) and then seeing that builds
continue to work with this patch.
(Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-devtools/python')
8 files changed, 8 insertions, 8 deletions
diff --git a/recipes-devtools/python/python3-boto3_1.17.51.bb b/recipes-devtools/python/python3-boto3_1.17.51.bb index 980b6cd2..9c94a34d 100644 --- a/recipes-devtools/python/python3-boto3_1.17.51.bb +++ b/recipes-devtools/python/python3-boto3_1.17.51.bb | |||
| @@ -13,4 +13,4 @@ SRC_URI[sha256sum] = "c45e7d3aef8965ae1b42c9855c31ded19fbb38cfad0a34cc37dc880ded | |||
| 13 | 13 | ||
| 14 | inherit pypi setuptools3 | 14 | inherit pypi setuptools3 |
| 15 | 15 | ||
| 16 | RDEPENDS_${PN} += "python3-botocore python3-urllib3 python3-unixadmin" | 16 | RDEPENDS:${PN} += "python3-botocore python3-urllib3 python3-unixadmin" |
diff --git a/recipes-devtools/python/python3-botocore_1.20.51.bb b/recipes-devtools/python/python3-botocore_1.20.51.bb index 93e4eab1..ca506f6f 100644 --- a/recipes-devtools/python/python3-botocore_1.20.51.bb +++ b/recipes-devtools/python/python3-botocore_1.20.51.bb | |||
| @@ -7,4 +7,4 @@ SRC_URI[sha256sum] = "c853d6c2321e2f2328282c7d49d7b1a06201826ba0e7049c6975ab5f22 | |||
| 7 | 7 | ||
| 8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
| 9 | 9 | ||
| 10 | RDEPENDS_${PN} += "python3-jmespath python3-dateutil python3-logging" | 10 | RDEPENDS:${PN} += "python3-jmespath python3-dateutil python3-logging" |
diff --git a/recipes-devtools/python/python3-docker_5.0.0.bb b/recipes-devtools/python/python3-docker_5.0.0.bb index 6b6e844b..44d65b05 100644 --- a/recipes-devtools/python/python3-docker_5.0.0.bb +++ b/recipes-devtools/python/python3-docker_5.0.0.bb | |||
| @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61 | |||
| 8 | 8 | ||
| 9 | DEPENDS += "${PYTHON_PN}-pip-native" | 9 | DEPENDS += "${PYTHON_PN}-pip-native" |
| 10 | 10 | ||
| 11 | RDEPENDS_${PN} += " \ | 11 | RDEPENDS:${PN} += " \ |
| 12 | ${PYTHON_PN}-misc \ | 12 | ${PYTHON_PN}-misc \ |
| 13 | ${PYTHON_PN}-six \ | 13 | ${PYTHON_PN}-six \ |
| 14 | ${PYTHON_PN}-docker-pycreds \ | 14 | ${PYTHON_PN}-docker-pycreds \ |
diff --git a/recipes-devtools/python/python3-dockerpty_0.4.1.bb b/recipes-devtools/python/python3-dockerpty_0.4.1.bb index cde2d128..6834400c 100644 --- a/recipes-devtools/python/python3-dockerpty_0.4.1.bb +++ b/recipes-devtools/python/python3-dockerpty_0.4.1.bb | |||
| @@ -8,7 +8,7 @@ inherit pypi setuptools3 | |||
| 8 | SRC_URI[md5sum] = "028bacb34536f3ee6a2ccd668c27e8e4" | 8 | SRC_URI[md5sum] = "028bacb34536f3ee6a2ccd668c27e8e4" |
| 9 | SRC_URI[sha256sum] = "69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce" | 9 | SRC_URI[sha256sum] = "69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce" |
| 10 | 10 | ||
| 11 | RDEPENDS_${PN} += "\ | 11 | RDEPENDS:${PN} += "\ |
| 12 | ${PYTHON_PN}-fcntl \ | 12 | ${PYTHON_PN}-fcntl \ |
| 13 | ${PYTHON_PN}-io \ | 13 | ${PYTHON_PN}-io \ |
| 14 | ${PYTHON_PN}-six \ | 14 | ${PYTHON_PN}-six \ |
diff --git a/recipes-devtools/python/python3-fastentrypoints_0.12.bb b/recipes-devtools/python/python3-fastentrypoints_0.12.bb index 53bed187..c64c4e1f 100644 --- a/recipes-devtools/python/python3-fastentrypoints_0.12.bb +++ b/recipes-devtools/python/python3-fastentrypoints_0.12.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://README.rst;md5=f212a0cb34eb678477972d2011fb365a" | |||
| 12 | 12 | ||
| 13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
| 14 | 14 | ||
| 15 | RDEPENDS_${PN} += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pickle" | 15 | RDEPENDS:${PN} += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pickle" |
| 16 | 16 | ||
| 17 | SRC_URI[md5sum] = "390ad9a9229164a06156a5b1f0ef1b22" | 17 | SRC_URI[md5sum] = "390ad9a9229164a06156a5b1f0ef1b22" |
| 18 | SRC_URI[sha256sum] = "ff284f1469bd65400599807d2c6284d5b251398e6e28811f5f77fd262292410b" | 18 | SRC_URI[sha256sum] = "ff284f1469bd65400599807d2c6284d5b251398e6e28811f5f77fd262292410b" |
diff --git a/recipes-devtools/python/python3-nacl_1.3.0.bb b/recipes-devtools/python/python3-nacl_1.3.0.bb index d0a99aef..42a3cd9d 100644 --- a/recipes-devtools/python/python3-nacl_1.3.0.bb +++ b/recipes-devtools/python/python3-nacl_1.3.0.bb | |||
| @@ -16,7 +16,7 @@ DEPENDS += "\ | |||
| 16 | python3-pip-native \ | 16 | python3-pip-native \ |
| 17 | " | 17 | " |
| 18 | 18 | ||
| 19 | RDEPENDS_${PN}_class-target += " \ | 19 | RDEPENDS:${PN}:class-target += " \ |
| 20 | python3-cffi \ | 20 | python3-cffi \ |
| 21 | python3-pycparser \ | 21 | python3-pycparser \ |
| 22 | " | 22 | " |
diff --git a/recipes-devtools/python/python3-newrelic_6.2.0.156.bb b/recipes-devtools/python/python3-newrelic_6.2.0.156.bb index d3bbd9e4..62371f60 100644 --- a/recipes-devtools/python/python3-newrelic_6.2.0.156.bb +++ b/recipes-devtools/python/python3-newrelic_6.2.0.156.bb | |||
| @@ -16,7 +16,7 @@ DEPENDS += "python3-setuptools-scm-native" | |||
| 16 | 16 | ||
| 17 | SRC_URI += "file://0001-setup.py-tweak-setuptools_scm-version-dependency.patch" | 17 | SRC_URI += "file://0001-setup.py-tweak-setuptools_scm-version-dependency.patch" |
| 18 | 18 | ||
| 19 | FILES_${PN}-dbg += "\ | 19 | FILES:${PN}-dbg += "\ |
| 20 | ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \ | 20 | ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \ |
| 21 | ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \ | 21 | ${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \ |
| 22 | " | 22 | " |
diff --git a/recipes-devtools/python/python3-webob_1.8.7.bb b/recipes-devtools/python/python3-webob_1.8.7.bb index a51f8ddf..d23ddfd2 100644 --- a/recipes-devtools/python/python3-webob_1.8.7.bb +++ b/recipes-devtools/python/python3-webob_1.8.7.bb | |||
| @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dce | |||
| 10 | 10 | ||
| 11 | inherit setuptools3 pypi | 11 | inherit setuptools3 pypi |
| 12 | 12 | ||
| 13 | RDEPENDS_${PN} += " \ | 13 | RDEPENDS:${PN} += " \ |
| 14 | python3-sphinx \ | 14 | python3-sphinx \ |
| 15 | " | 15 | " |
| 16 | 16 | ||
