aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2010-05-05 14:21:50 +0200
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-05-05 14:46:41 +0200
commitd6cda85cb5380cc9a769fddb791c956d4e591103 (patch)
treeea1750c0b3a083fed51b6259c2fb756e71aa3a69
parent43198bf4b55dfd95c0e5c5eed07a6c52611b43cd (diff)
downloadopenembedded-d6cda85cb5380cc9a769fddb791c956d4e591103.tar.gz
python 2.6: add ssl to python-io
-rwxr-xr-xcontrib/python/generate-manifest-2.6.py8
-rw-r--r--recipes/python/python-2.6-manifest.inc5
-rw-r--r--recipes/python/python.inc2
3 files changed, 7 insertions, 8 deletions
diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py
index fe0e38596b..1d1085d6e6 100755
--- a/contrib/python/generate-manifest-2.6.py
+++ b/contrib/python/generate-manifest-2.6.py
@@ -9,10 +9,10 @@ import os
import sys
import time
-VERSION = "2.6.2"
+VERSION = "2.6.4"
__author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20091004"
+__version__ = "20100505"
class MakefileMaker:
@@ -23,7 +23,7 @@ class MakefileMaker:
self.output = outfile
self.out( """
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '%s' Version %s (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: '%s' Version %s (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
""" % ( sys.argv[0], __version__ ) )
@@ -248,7 +248,7 @@ if __name__ == "__main__":
m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
"lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
- "pipes.* socket.* tempfile.* StringIO.* " )
+ "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
"json" ) # package
diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
index cee12c866c..16e4465285 100644
--- a/recipes/python/python-2.6-manifest.inc
+++ b/recipes/python/python-2.6-manifest.inc
@@ -1,6 +1,5 @@
-
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '../../contrib/python/generate-manifest-2.6.py' Version 20091004 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: './generate-manifest-2.6.py' Version 20100505 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
@@ -51,7 +50,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
DESCRIPTION_python-io="Python Low-Level I/O"
RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
DESCRIPTION_python-compiler="Python Compiler Support"
RDEPENDS_python-compiler="python-core"
diff --git a/recipes/python/python.inc b/recipes/python/python.inc
index 7e61f795ba..aff18db6f8 100644
--- a/recipes/python/python.inc
+++ b/recipes/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
SECTION = "devel/python"
PRIORITY = "optional"
# bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml9"
DEFAULT_PREFERENCE = "-26"