diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-08-31 18:36:06 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-08-31 18:36:06 +0200 |
| commit | 0ef4a105d02563ebcfce9d141077fef495c90dd4 (patch) | |
| tree | 31e7020467af38e5d9691042334771d390011ccd /recipes/python | |
| parent | 2d5f5e12bb0e9ac682d84cabcf678829cc9a9b87 (diff) | |
| download | openembedded-0ef4a105d02563ebcfce9d141077fef495c90dd4.tar.gz | |
python: fix -netserver and -devel packaging, convert 2.6.1 to inc_pr
Diffstat (limited to 'recipes/python')
| -rw-r--r-- | recipes/python/python-2.6-manifest.inc | 6 | ||||
| -rw-r--r-- | recipes/python/python.inc | 2 | ||||
| -rw-r--r-- | recipes/python/python_2.6.1.bb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc index aff86a1f76..00eda6b9c9 100644 --- a/recipes/python/python-2.6-manifest.inc +++ b/recipes/python/python-2.6-manifest.inc @@ -1,6 +1,6 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: '/local/pkg/oe/openembedded/contrib/python/generate-manifest-2.6.py' Version 20090812 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# Generator: '../../contrib/python/generate-manifest-2.6.py' Version 20090812 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de> # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy @@ -99,7 +99,7 @@ FILES_python-json="${libdir}/python2.6/json " DESCRIPTION_python-devel="Python Development Package" RDEPENDS_python-devel="python-core" -FILES_python-devel="${includedir} ${libdir}/python2.6/config " +FILES_python-devel="${includedir} ${libdir}/libpython2.6.so ${libdir}/python2.6/config " DESCRIPTION_python-difflib="Python helpers for computing deltas between objects." RDEPENDS_python-difflib="python-lang python-re" @@ -151,7 +151,7 @@ FILES_python-pprint="${libdir}/python2.6/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" RDEPENDS_python-netserver="python-core python-netclient" -FILES_python-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/BaseHTTPServer.* ${libdir}/python2.6/SimpleHTTPServer.* ${libdir}/python2.6/SocketServer.* " +FILES_python-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/*HTTPServer.* ${libdir}/python2.6/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" RDEPENDS_python-curses="python-core" diff --git a/recipes/python/python.inc b/recipes/python/python.inc index b31d80e688..5791297609 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 = "ml6" +INC_PR = "ml7" DEFAULT_PREFERENCE = "-26" diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb index 8ca51ae3bf..0a6a253ae0 100644 --- a/recipes/python/python_2.6.1.bb +++ b/recipes/python/python_2.6.1.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "ml5" +PR = "${INC_PR}.0" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ |