summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@enea.com>2014-12-05 18:08:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-11 11:34:55 +0000
commit34995442a2ff07272afd497e0f94affdcc9ef963 (patch)
tree8a0fbfa7cf0795009bbdb3b473b248aad71fac5d
parent7f7d3b729830849be35d6e6e48e600bcf5065f96 (diff)
downloadpoky-34995442a2ff07272afd497e0f94affdcc9ef963.tar.gz
python: fix ssl import error
Fix this ssl import error: Python 2.7.3 (default, Dec 5 2014, 16:24:17) [GCC 4.9.1] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import ssl Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib/python2.7/ssl.py", line 92, in <module> import base64 # for DER-to-PEM translation ImportError: No module named base64 (From OE-Core rev: dfa34e70a4c7543dc67835c2e9a270ccd011ac72) Signed-off-by: Maxin B. John <maxin.john@enea.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 a8afe13a79..9a514b1fc2 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -122,7 +122,7 @@ RDEPENDS_${PN}-importlib="${PN}-core"
122FILES_${PN}-importlib="${libdir}/python2.7/importlib " 122FILES_${PN}-importlib="${libdir}/python2.7/importlib "
123 123
124SUMMARY_${PN}-io="Python low-level I/O" 124SUMMARY_${PN}-io="Python low-level I/O"
125RDEPENDS_${PN}-io="${PN}-core ${PN}-math ${PN}-textutils" 125RDEPENDS_${PN}-io="${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient"
126FILES_${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.* " 126FILES_${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.* "
127 127
128SUMMARY_${PN}-json="Python JSON support" 128SUMMARY_${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 65486d8ec4..21b874f6cc 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", 278 m.addPackage( "${PN}-io", "Python low-level I/O", "${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient",
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