diff options
-rw-r--r-- | meta/recipes-devtools/python/python3/python3-manifest.json | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.7.4.bb | 5 |
2 files changed, 9 insertions, 3 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}", |
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 | ||