summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-06-14 12:25:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 14:53:58 +0100
commitd973074bf6d4c8f93041880b478ea77a3f9056cc (patch)
tree3cd03b05d7c1e925e9bef2f9695ab730b31fe588 /scripts
parentb7ebb2cd2ffcfd01ddaa3d29a2dda021a3fb8e77 (diff)
downloadpoky-d973074bf6d4c8f93041880b478ea77a3f9056cc.tar.gz
python-3.5: Move bz2.py, lzma.py and _compression.py from python3-misc to python3-compression
* the /usr/lib/python3.5/_compression.py file is possibly incorrectly included in python3-misc. This runtime dependency is needed in order to use e.g. gzip.py in runtime: >>> import tarfile, zlib, gzip Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib/python3.5/gzip.py", line 12, in <module> import _compression ImportError: No module named '_compression' * at least python3-tests and lzma and bz2 still in python3-misc are using this as well: $ grep -R import.*_compression tmp-glibc/work/aarch64-oe-linux/python3/3.5.2-r1.0/packages-split/ tmp-glibc/work/aarch64-oe-linux/python3/3.5.2-r1.0/packages-split/python3-compression/usr/lib/python3.5/gzip.py:import _compression tmp-glibc/work/aarch64-oe-linux/python3/3.5.2-r1.0/packages-split/python3-misc/usr/lib/python3.5/lzma.py:import _compression tmp-glibc/work/aarch64-oe-linux/python3/3.5.2-r1.0/packages-split/python3-misc/usr/lib/python3.5/bz2.py:import _compression tmp-glibc/work/aarch64-oe-linux/python3/3.5.2-r1.0/packages-split/python3-tests/usr/lib/python3.5/test/test_bz2.py:import _compression tmp-glibc/work/aarch64-oe-linux/python3/3.5.2-r1.0/packages-split/python3-tests/usr/lib/python3.5/test/test_lzma.py:import _compression and python3-tests are using it as well, so add new runtime dependency on python3-compression (From OE-Core rev: 987363c3c720b3764f4d64976d7455f6b0bae99c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/python/generate-manifest-3.5.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index 0de8fedbc2..2975e109c9 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -252,7 +252,7 @@ if __name__ == "__main__":
252 "py_compile.* compileall.*" ) 252 "py_compile.* compileall.*" )
253 253
254 m.addPackage( "${PN}-compression", "Python high-level compression support", "${PN}-core ${PN}-codecs ${PN}-importlib ${PN}-threading ${PN}-shell", 254 m.addPackage( "${PN}-compression", "Python high-level compression support", "${PN}-core ${PN}-codecs ${PN}-importlib ${PN}-threading ${PN}-shell",
255 "gzip.* zipfile.* tarfile.* lib-dynload/bz2.*.so lib-dynload/zlib.*.so" ) 255 "gzip.* zipfile.* tarfile.* lib-dynload/bz2.*.so lib-dynload/zlib.*.so bz2.py lzma.py _compression.py" )
256 256
257 m.addPackage( "${PN}-crypt", "Python basic cryptographic and hashing support", "${PN}-core", 257 m.addPackage( "${PN}-crypt", "Python basic cryptographic and hashing support", "${PN}-core",
258 "hashlib.* md5.* sha.* lib-dynload/crypt.*.so lib-dynload/_hashlib.*.so lib-dynload/_sha256.*.so lib-dynload/_sha512.*.so" ) 258 "hashlib.* md5.* sha.* lib-dynload/crypt.*.so lib-dynload/_hashlib.*.so lib-dynload/_sha256.*.so lib-dynload/_sha512.*.so" )
@@ -400,7 +400,7 @@ if __name__ == "__main__":
400 m.addPackage( "${PN}-terminal", "Python terminal controlling support", "${PN}-core ${PN}-io", 400 m.addPackage( "${PN}-terminal", "Python terminal controlling support", "${PN}-core ${PN}-io",
401 "pty.* tty.*" ) 401 "pty.* tty.*" )
402 402
403 m.addPackage( "${PN}-tests", "Python tests", "${PN}-core", 403 m.addPackage( "${PN}-tests", "Python tests", "${PN}-core ${PN}-compression",
404 "test" ) # package 404 "test" ) # package
405 405
406 m.addPackage( "${PN}-threading", "Python threading & synchronization support", "${PN}-core ${PN}-lang", 406 m.addPackage( "${PN}-threading", "Python threading & synchronization support", "${PN}-core ${PN}-lang",