summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsh Charles <ashcharles@gmail.com>2015-07-07 14:22:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:16 +0100
commit3f79bf7f6c91df80df792d89402c6eecd7f47a7a (patch)
tree31476b362220a74476e2d45377fc06fd058320fa
parent45772bab329821ad425b20e630749c2a6c82c235 (diff)
downloadpoky-3f79bf7f6c91df80df792d89402c6eecd7f47a7a.tar.gz
python-io: Add runtime dependency on contextlib
The python-io package includes ssl.py module which imports the contextlib library. This applied to Python 2.7.9 but not 3.3. (From OE-Core rev: b6b9df15a630605619bff060d5073272685058d6) Signed-off-by: Ash Charles <ashcharles@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-2.7-manifest.inc2
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index 9ba9c7f2ea..dd8d82521b 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -130,7 +130,7 @@ RDEPENDS_${PN}-importlib="${PN}-core"
130FILES_${PN}-importlib="${libdir}/python2.7/importlib " 130FILES_${PN}-importlib="${libdir}/python2.7/importlib "
131 131
132SUMMARY_${PN}-io="Python low-level I/O" 132SUMMARY_${PN}-io="Python low-level I/O"
133RDEPENDS_${PN}-io="${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient" 133RDEPENDS_${PN}-io="${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient ${PN}-contextlib"
134FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* " 134FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* "
135 135
136SUMMARY_${PN}-json="Python JSON support" 136SUMMARY_${PN}-json="Python JSON support"
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index a368c8af10..936522efc5 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -275,7 +275,7 @@ if __name__ == "__main__":
275 m.addPackage( "${PN}-image", "Python graphical image handling", "${PN}-core", 275 m.addPackage( "${PN}-image", "Python graphical image handling", "${PN}-core",
276 "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" ) 276 "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" )
277 277
278 m.addPackage( "${PN}-io", "Python low-level I/O", "${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient", 278 m.addPackage( "${PN}-io", "Python low-level I/O", "${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient ${PN}-contextlib",
279 "lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + 279 "lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
280 "pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.*" ) 280 "pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.*" )
281 281