diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-13 10:34:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-24 21:46:06 +0000 |
commit | 68a612b7d31d270348ef5439d7f779c309bdb6ec (patch) | |
tree | 65305ed16b0fdfd758c33db4b77180e78c0365be | |
parent | 8883ee32f2a77bf532832d4fad5c20912a1a3630 (diff) | |
download | poky-68a612b7d31d270348ef5439d7f779c309bdb6ec.tar.gz |
python-3.5: Fix manifest to handle reprlib correctly
The current line is looking for py files in __pycache__ which is incorrect.
Fix it to correctly include the right files (modelled after ${PN}-signal).
Patch isn't relavent to later releases since manifest generation changed
significantly.
[YOCTO #12831]
(From OE-Core rev: 3638cb32ba9ba32b4d498fc31ab7fdf82f0d2495)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python-3.5-manifest.inc | 2 | ||||
-rwxr-xr-x | scripts/contrib/python/generate-manifest-3.5.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 0260e87e75..710b22eaa3 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc | |||
@@ -194,7 +194,7 @@ FILES_${PN}-readline="${libdir}/python3.5/lib-dynload/readline.*.so ${libdir}/py | |||
194 | 194 | ||
195 | SUMMARY_${PN}-reprlib="Python alternate repr() implementation" | 195 | SUMMARY_${PN}-reprlib="Python alternate repr() implementation" |
196 | RDEPENDS_${PN}-reprlib="${PN}-core" | 196 | RDEPENDS_${PN}-reprlib="${PN}-core" |
197 | FILES_${PN}-reprlib="${libdir}/python3.5/reprlib.py ${libdir}/python3.5/__pycache__/reprlib.py " | 197 | FILES_${PN}-reprlib="${libdir}/python3.5/reprlib.* ${libdir}/python3.5/__pycache__/reprlib.* " |
198 | 198 | ||
199 | SUMMARY_${PN}-resource="Python resource control interface" | 199 | SUMMARY_${PN}-resource="Python resource control interface" |
200 | RDEPENDS_${PN}-resource="${PN}-core" | 200 | RDEPENDS_${PN}-resource="${PN}-core" |
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 6352f8f120..750d4fc754 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py | |||
@@ -371,7 +371,7 @@ if __name__ == "__main__": | |||
371 | "lib-dynload/readline.*.so rlcompleter.*" ) | 371 | "lib-dynload/readline.*.so rlcompleter.*" ) |
372 | 372 | ||
373 | m.addPackage( "${PN}-reprlib", "Python alternate repr() implementation", "${PN}-core", | 373 | m.addPackage( "${PN}-reprlib", "Python alternate repr() implementation", "${PN}-core", |
374 | "reprlib.py" ) | 374 | "reprlib.*" ) |
375 | 375 | ||
376 | m.addPackage( "${PN}-resource", "Python resource control interface", "${PN}-core", | 376 | m.addPackage( "${PN}-resource", "Python resource control interface", "${PN}-core", |
377 | "lib-dynload/resource.*.so" ) | 377 | "lib-dynload/resource.*.so" ) |