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>
This commit is contained in:
Ross Burton
2019-10-17 12:29:43 +01:00
committed by Richard Purdie
parent 4b467ed084
commit 52fe6a79d9
2 changed files with 9 additions and 3 deletions

View File

@@ -210,7 +210,10 @@
"summary": "Python interpreter and core modules",
"rdepends": [],
"files": [
"${bindir}/python*[!-config]",
"${bindir}/python3",
"${bindir}/python${PYTHON_MAJMIN}",
"${bindir}/python${PYTHON_MAJMIN}.real",
"${bindir}/python${PYTHON_BINABI}",
"${includedir}/python${PYTHON_BINABI}/pyconfig*.h",
"${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]",
"${libdir}/python${PYTHON_MAJMIN}/UserDict.py",
@@ -487,7 +490,7 @@
"files": [
"${base_libdir}/*.a",
"${base_libdir}/*.o",
"${bindir}/python*-config",
"${bindir}/python*-config*",
"${datadir}/aclocal",
"${datadir}/pkgconfig",
"${includedir}",