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/python3-manifest.json | |
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/python3-manifest.json')
-rw-r--r-- | meta/recipes-devtools/python/python3/python3-manifest.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 1eddda91b4..dba92b0e39 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json | |||
@@ -210,7 +210,10 @@ | |||
210 | "summary": "Python interpreter and core modules", | 210 | "summary": "Python interpreter and core modules", |
211 | "rdepends": [], | 211 | "rdepends": [], |
212 | "files": [ | 212 | "files": [ |
213 | "${bindir}/python*[!-config]", | 213 | "${bindir}/python3", |
214 | "${bindir}/python${PYTHON_MAJMIN}", | ||
215 | "${bindir}/python${PYTHON_MAJMIN}.real", | ||
216 | "${bindir}/python${PYTHON_BINABI}", | ||
214 | "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", | 217 | "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", |
215 | "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", | 218 | "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", |
216 | "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", | 219 | "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", |
@@ -487,7 +490,7 @@ | |||
487 | "files": [ | 490 | "files": [ |
488 | "${base_libdir}/*.a", | 491 | "${base_libdir}/*.a", |
489 | "${base_libdir}/*.o", | 492 | "${base_libdir}/*.o", |
490 | "${bindir}/python*-config", | 493 | "${bindir}/python*-config*", |
491 | "${datadir}/aclocal", | 494 | "${datadir}/aclocal", |
492 | "${datadir}/pkgconfig", | 495 | "${datadir}/pkgconfig", |
493 | "${includedir}", | 496 | "${includedir}", |