diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-07 17:53:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-08 10:57:19 +0000 |
commit | c92e780c85523fe860602b947b029d7782afa47a (patch) | |
tree | b5e0a128ee7729b92fd916c419cb925673ce3fb4 /meta | |
parent | d772d8bb1b79860a0d3667e64015e9770520b80b (diff) | |
download | poky-c92e780c85523fe860602b947b029d7782afa47a.tar.gz |
python3: tweaks to achieve 100% pass rate in ptest
(From OE-Core rev: 22f4f1ef17219448416b7cf2a570c7acd7149a64)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python3/python3-manifest.json | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.7.2.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 24f9805fbd..0a4ab2cbe4 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json | |||
@@ -212,6 +212,7 @@ | |||
212 | "files": [ | 212 | "files": [ |
213 | "${bindir}/python*[!-config]", | 213 | "${bindir}/python*[!-config]", |
214 | "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", | 214 | "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", |
215 | "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", | ||
215 | "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", | 216 | "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", |
216 | "${libdir}/python${PYTHON_MAJMIN}/UserList.py", | 217 | "${libdir}/python${PYTHON_MAJMIN}/UserList.py", |
217 | "${libdir}/python${PYTHON_MAJMIN}/UserString.py", | 218 | "${libdir}/python${PYTHON_MAJMIN}/UserString.py", |
@@ -491,8 +492,7 @@ | |||
491 | "${libdir}/*.la", | 492 | "${libdir}/*.la", |
492 | "${libdir}/*.o", | 493 | "${libdir}/*.o", |
493 | "${libdir}/lib*${SOLIBSDEV}", | 494 | "${libdir}/lib*${SOLIBSDEV}", |
494 | "${libdir}/pkgconfig", | 495 | "${libdir}/pkgconfig" |
495 | "${prefix}/lib/python${PYTHON_MAJMIN}/config*/" | ||
496 | ], | 496 | ], |
497 | "rdepends": [ | 497 | "rdepends": [ |
498 | "core" | 498 | "core" |
diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb b/meta/recipes-devtools/python/python3_3.7.2.bb index e05ab42b0c..8f9d7dc8fe 100644 --- a/meta/recipes-devtools/python/python3_3.7.2.bb +++ b/meta/recipes-devtools/python/python3_3.7.2.bb | |||
@@ -281,7 +281,7 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} ${libdir}/python${PYTHON_MA | |||
281 | PACKAGES += "${PN}-man" | 281 | PACKAGES += "${PN}-man" |
282 | FILES_${PN}-man = "${datadir}/man" | 282 | FILES_${PN}-man = "${datadir}/man" |
283 | 283 | ||
284 | RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2" | 284 | RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc" |
285 | RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" | 285 | RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '', d)}" |
286 | RDEPENDS_${PN}-dev = "" | 286 | RDEPENDS_${PN}-dev = "" |
287 | 287 | ||