diff options
| author | Ross Burton <ross.burton@intel.com> | 2019-10-17 12:29:43 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-23 16:30:35 +0100 |
| commit | 52fe6a79d97e596ba5c0b2638aa0b0e605f818a5 (patch) | |
| tree | 909089f35aaa4c2851931927181f8067917c66db /meta/recipes-devtools/python/python3_3.7.4.bb | |
| parent | 4b467ed084b2fc125ad068d91606e72d1d9ebe36 (diff) | |
| download | poky-52fe6a79d97e596ba5c0b2638aa0b0e605f818a5.tar.gz | |
python3: ensure that all forms of python3-config are in python3-dev
In multilib builds python3-config gets renamed to eg python3-config-lib64 but
this ends up being packaged in python3-core not python3-dev.
The manifest uses an extended glob to package all python* binaries that are not
python-config into python3-core:
"${bindir}/python*[!-config]",
However, this doesn't do what was intended, as [] is a range match.
Replace the globs with more verbose but precise matches, and clear out
FILES_${PN} to ensure that new binaries don't end up in ${PN} (which shouldn't
exist).
[ YOCTO #13592 ]
(From OE-Core rev: c780f21c33b0684dafff3421600cd1c11ddd0c48)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3_3.7.4.bb')
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.7.4.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb b/meta/recipes-devtools/python/python3_3.7.4.bb index 01230b0fec..8c429e95c3 100644 --- a/meta/recipes-devtools/python/python3_3.7.4.bb +++ b/meta/recipes-devtools/python/python3_3.7.4.bb | |||
| @@ -303,11 +303,14 @@ do_create_manifest[depends] += "${PN}:do_prepare_recipe_sysroot" | |||
| 303 | do_create_manifest[depends] += "${PN}:do_patch" | 303 | do_create_manifest[depends] += "${PN}:do_patch" |
| 304 | 304 | ||
| 305 | # manual dependency additions | 305 | # manual dependency additions |
| 306 | RPROVIDES_${PN}-modules = "${PN}" | ||
| 307 | RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules" | 306 | RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules" |
| 308 | RRECOMMENDS_${PN}-crypt_append_class-target = " openssl ca-certificates" | 307 | RRECOMMENDS_${PN}-crypt_append_class-target = " openssl ca-certificates" |
| 309 | RRECOMMENDS_${PN}-crypt_append_class-nativesdk = " openssl ca-certificates" | 308 | RRECOMMENDS_${PN}-crypt_append_class-nativesdk = " openssl ca-certificates" |
| 310 | 309 | ||
| 310 | # For historical reasons PN is empty and provided by python3-modules | ||
| 311 | FILES_${PN} = "" | ||
| 312 | RPROVIDES_${PN}-modules = "${PN}" | ||
| 313 | |||
| 311 | FILES_${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3" | 314 | FILES_${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3" |
| 312 | FILES_${PN}-idle += "${bindir}/idle3 ${bindir}/idle${PYTHON_MAJMIN}" | 315 | FILES_${PN}-idle += "${bindir}/idle3 ${bindir}/idle${PYTHON_MAJMIN}" |
| 313 | 316 | ||
