* [PATCH 0/4] python3: fix building extension modules, make python3-modules installable
@ 2015-07-28 14:58 Dominic Sacré
2015-07-28 14:58 ` [PATCH 1/4] python3: detect libraries in STAGING_LIBDIR Dominic Sacré
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Dominic Sacré @ 2015-07-28 14:58 UTC (permalink / raw)
To: openembedded-core
This series of patches fixes several issues with the python3 recipe.
These caused packages to be incomplete or missing, and prevented the
python3-modules package from being installed.
[YOCTO #8048]
Dominic Sacré (4):
python3: detect libraries in STAGING_LIBDIR
python3: remove package python3-robotparser
python3: remove 2to3 symlink from package python3-2to3
python3: delete patches that don't get applied anywhere
.../python/python-3.4-manifest.inc | 12 ++---
.../python3/06-ctypes-libffi-fix-configure.patch | 44 ---------------
.../python/python3/fix-ast.h-dependency.patch | 26 ---------
.../python/python3/fix_ssl_include_dir.patch | 41 --------------
.../python3/pip_build_directory_unclean.patch | 28 ----------
...python3-fix-build-error-with-Readline-6.3.patch | 62 ----------------------
.../python/python3/remove_sqlite_rpath.patch | 19 -------
.../setup.py-find-libraries-in-staging-dirs.patch | 30 +++++++++++
meta/recipes-devtools/python/python3_3.4.3.bb | 5 +-
scripts/contrib/python/generate-manifest-3.4.py | 5 +-
10 files changed, 39 insertions(+), 233 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch
delete mode 100644 meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch
delete mode 100644 meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch
delete mode 100644 meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch
delete mode 100644 meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch
delete mode 100644 meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch
create mode 100644 meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
--
2.4.6
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] python3: detect libraries in STAGING_LIBDIR
2015-07-28 14:58 [PATCH 0/4] python3: fix building extension modules, make python3-modules installable Dominic Sacré
@ 2015-07-28 14:58 ` Dominic Sacré
2015-07-28 14:58 ` [PATCH 2/4] python3: remove package python3-robotparser Dominic Sacré
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Dominic Sacré @ 2015-07-28 14:58 UTC (permalink / raw)
To: openembedded-core
Patch setup.py so that the detect_modules() function looks for required
libraries and headers in STAGING_LIBDIR / STAGING_INCDIR.
Without this patch, several extension modules are not built, even though
their dependencies are present in the compiler's search paths.
The result is the following warning, and ultimately incomplete packages:
| The necessary bits to build these optional modules were not found:
| _bz2 _curses_panel _dbm
| _gdbm _lzma _sqlite3
| nis readline zlib
| To find the necessary bits, look in setup.py in detect_modules() for the module's name.
With the Python 3.3 version of the recipe, at least some of these modules
were built, because STAGING_LIBDIR happened to be in the search path
by coincidence. Due to changes to distutils in Python 3.4, this is no
longer the case.
A previous patch that only affects the search paths for SSL is dropped, as
this one is a more complete fix for [YOCTO #7768].
Part of the fix for [YOCTO #8048].
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
---
.../python/python3/fix_ssl_include_dir.patch | 41 ----------------------
.../setup.py-find-libraries-in-staging-dirs.patch | 30 ++++++++++++++++
meta/recipes-devtools/python/python3_3.4.3.bb | 2 +-
3 files changed, 31 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch
create mode 100644 meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
diff --git a/meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch b/meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch
deleted file mode 100644
index 9972829..0000000
--- a/meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [Embedded Specific]
-
-Python 3 fails to compile the ssl module, later, when requesting to install packages that should include such modules
-no error is shown; but a running python shell trying to import the ssl library results in an import error,
-since it was never installed.
-
-This looks for the modules in the correct directories so they are corretcly compiled and installed along with python3.
-
-ImportError: No module named _ssl
-
-Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
-
-Index: Python-3.4.3/setup.py
-===================================================================
---- Python-3.4.3.orig/setup.py
-+++ Python-3.4.3/setup.py
-@@ -726,10 +726,9 @@ class PyBuildExt(build_ext):
- exts.append( Extension('_socket', ['socketmodule.c'],
- depends = ['socketmodule.h']) )
- # Detect SSL support for the socket module (via _ssl)
-- search_for_ssl_incs_in = [
-- '/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-- ]
-+ search_for_ssl_incs_in = []
-+ for dir in [os.getenv("STAGING_INCDIR")]:
-+ search_for_ssl_incs_in.append(dir)
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
- search_for_ssl_incs_in
- )
-@@ -739,9 +738,7 @@ class PyBuildExt(build_ext):
- if krb5_h:
- ssl_incs += krb5_h
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-- ] )
-+ [os.getenv("STAGING_LIBDIR")])
-
- if (ssl_incs is not None and
- ssl_libs is not None):
diff --git a/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch b/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
new file mode 100644
index 0000000..f26bd38
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
@@ -0,0 +1,30 @@
+Patch setup.py so that the detect_modules() function looks for required
+libraries and headers in STAGING_LIBDIR / STAGING_INCDIR.
+
+Without this patch, several extension modules are not built, even though
+their dependencies are present in the compiler's search paths.
+The result is the following warning, and ultimately incomplete packages:
+
+| The necessary bits to build these optional modules were not found:
+| _bz2 _curses_panel _dbm
+| _gdbm _lzma _sqlite3
+| nis readline zlib
+| To find the necessary bits, look in setup.py in detect_modules() for the module's name.
+
+Upstream-Status: Inappropriate [Cross compile specific]
+
+Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
+
+Index: Python-3.4.3/setup.py
+===================================================================
+--- Python-3.4.3.orig/setup.py
++++ Python-3.4.3/setup.py
+@@ -521,6 +521,8 @@ class PyBuildExt(build_ext):
+ else:
+ lib_dirs = self.compiler.library_dirs[:]
+ inc_dirs = self.compiler.include_dirs[:]
++ lib_dirs.append(os.environ.get('STAGING_LIBDIR'))
++ inc_dirs.append(os.environ.get('STAGING_INCDIR'))
+ exts = []
+ missing = []
+
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.4.3.bb
index dce778a..e2d9f79 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3_3.4.3.bb
@@ -36,7 +36,7 @@ SRC_URI += "\
file://python3-setup.py-no-host-headers-libs.patch \
file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
- file://fix_ssl_include_dir.patch \
+ file://setup.py-find-libraries-in-staging-dirs.patch \
"
SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5"
SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8"
--
2.4.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] python3: remove package python3-robotparser
2015-07-28 14:58 [PATCH 0/4] python3: fix building extension modules, make python3-modules installable Dominic Sacré
2015-07-28 14:58 ` [PATCH 1/4] python3: detect libraries in STAGING_LIBDIR Dominic Sacré
@ 2015-07-28 14:58 ` Dominic Sacré
2015-08-09 1:02 ` Khem Raj
2015-07-28 14:58 ` [PATCH 3/4] python3: remove 2to3 symlink from package python3-2to3 Dominic Sacré
2015-07-28 14:58 ` [PATCH 4/4] python3: delete patches that don't get applied anywhere Dominic Sacré
3 siblings, 1 reply; 7+ messages in thread
From: Dominic Sacré @ 2015-07-28 14:58 UTC (permalink / raw)
To: openembedded-core
robotparser has been moved to urllib.robotparser in Python 3, and gets
packaged as part of python3-netclient alongside the rest of urllib.
This causes python3-modules to depend on an empty/missing
python3-robotparser package.
robotparser.py is relatively small and has no dependencies outside
urllib, so it makes more sense to eliminate the python3-robotparser
package than to alter the manifest for python3-netclient.
Part of the fix for [YOCTO #8048].
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
---
meta/recipes-devtools/python/python-3.4-manifest.inc | 10 +++-------
scripts/contrib/python/generate-manifest-3.4.py | 3 ---
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc b/meta/recipes-devtools/python/python-3.4-manifest.inc
index 557acdf..77f0125 100644
--- a/meta/recipes-devtools/python/python-3.4-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.4-manifest.inc
@@ -5,9 +5,9 @@
-PROVIDES+="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
+PROVIDES+="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
-PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-modules"
+PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-modules"
SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator"
RDEPENDS_${PN}-2to3="${PN}-core"
@@ -197,10 +197,6 @@ SUMMARY_${PN}-resource="Python resource control interface"
RDEPENDS_${PN}-resource="${PN}-core"
FILES_${PN}-resource="${libdir}/python3.4/lib-dynload/resource.*.so "
-SUMMARY_${PN}-robotparser="Python robots.txt parser"
-RDEPENDS_${PN}-robotparser="${PN}-core ${PN}-netclient"
-FILES_${PN}-robotparser="${libdir}/python3.4/urllib/robotparser.* "
-
SUMMARY_${PN}-shell="Python shell-like functionality"
RDEPENDS_${PN}-shell="${PN}-core ${PN}-re"
FILES_${PN}-shell="${libdir}/python3.4/cmd.* ${libdir}/python3.4/commands.* ${libdir}/python3.4/dircache.* ${libdir}/python3.4/fnmatch.* ${libdir}/python3.4/glob.* ${libdir}/python3.4/popen2.* ${libdir}/python3.4/shlex.* ${libdir}/python3.4/shutil.* "
@@ -266,7 +262,7 @@ RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang"
FILES_${PN}-xmlrpc="${libdir}/python3.4/xmlrpclib.* ${libdir}/python3.4/SimpleXMLRPCServer.* ${libdir}/python3.4/DocXMLRPCServer.* ${libdir}/python3.4/xmlrpc "
SUMMARY_${PN}-modules="All Python modules"
-RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
+RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
ALLOW_EMPTY_${PN}-modules = "1"
diff --git a/scripts/contrib/python/generate-manifest-3.4.py b/scripts/contrib/python/generate-manifest-3.4.py
index 569fd3c..42c851c 100755
--- a/scripts/contrib/python/generate-manifest-3.4.py
+++ b/scripts/contrib/python/generate-manifest-3.4.py
@@ -343,9 +343,6 @@ if __name__ == "__main__":
m.addPackage( "${PN}-shell", "Python shell-like functionality", "${PN}-core ${PN}-re",
"cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
- m.addPackage( "${PN}-robotparser", "Python robots.txt parser", "${PN}-core ${PN}-netclient",
- "urllib/robotparser.*")
-
m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle",
"subprocess.*" )
--
2.4.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] python3: remove 2to3 symlink from package python3-2to3
2015-07-28 14:58 [PATCH 0/4] python3: fix building extension modules, make python3-modules installable Dominic Sacré
2015-07-28 14:58 ` [PATCH 1/4] python3: detect libraries in STAGING_LIBDIR Dominic Sacré
2015-07-28 14:58 ` [PATCH 2/4] python3: remove package python3-robotparser Dominic Sacré
@ 2015-07-28 14:58 ` Dominic Sacré
2015-07-28 14:58 ` [PATCH 4/4] python3: delete patches that don't get applied anywhere Dominic Sacré
3 siblings, 0 replies; 7+ messages in thread
From: Dominic Sacré @ 2015-07-28 14:58 UTC (permalink / raw)
To: openembedded-core
The 2to3 symlink conflicts with its Python 2 equivalent in package
python-2to3.
The Python 3 version of the tool is still available as 2to3-3.4.
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
---
meta/recipes-devtools/python/python-3.4-manifest.inc | 2 +-
meta/recipes-devtools/python/python3_3.4.3.bb | 3 +++
scripts/contrib/python/generate-manifest-3.4.py | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc b/meta/recipes-devtools/python/python-3.4-manifest.inc
index 77f0125..07e1490 100644
--- a/meta/recipes-devtools/python/python-3.4-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.4-manifest.inc
@@ -11,7 +11,7 @@ PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-comp
SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator"
RDEPENDS_${PN}-2to3="${PN}-core"
-FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python3.4/lib2to3 "
+FILES_${PN}-2to3="${libdir}/python3.4/lib2to3 "
SUMMARY_${PN}-asyncio="Python Asynchronous I/O, event loop, coroutines and tasks"
RDEPENDS_${PN}-asyncio="${PN}-core"
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.4.3.bb
index e2d9f79..6c2e21d 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3_3.4.3.bb
@@ -162,6 +162,9 @@ do_install() {
ARCH=${TARGET_ARCH} \
DESTDIR=${D} LIBDIR=${libdir} install
+ # avoid conflict with 2to3 from Python 2
+ rm -f ${D}/${bindir}/2to3
+
install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
if [ -e ${WORKDIR}/sitecustomize.py ]; then
diff --git a/scripts/contrib/python/generate-manifest-3.4.py b/scripts/contrib/python/generate-manifest-3.4.py
index 42c851c..06eecdc 100755
--- a/scripts/contrib/python/generate-manifest-3.4.py
+++ b/scripts/contrib/python/generate-manifest-3.4.py
@@ -194,7 +194,7 @@ if __name__ == "__main__":
"${datadir}/pkgconfig " )
m.addPackage( "${PN}-2to3", "Python automated Python 2 to 3 code translator", "${PN}-core",
- "${bindir}/2to3 lib2to3" ) # package
+ "lib2to3" ) # package
m.addPackage( "${PN}-idle", "Python Integrated Development Environment", "${PN}-core ${PN}-tkinter",
"${bindir}/idle idlelib" ) # package
--
2.4.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] python3: delete patches that don't get applied anywhere
2015-07-28 14:58 [PATCH 0/4] python3: fix building extension modules, make python3-modules installable Dominic Sacré
` (2 preceding siblings ...)
2015-07-28 14:58 ` [PATCH 3/4] python3: remove 2to3 symlink from package python3-2to3 Dominic Sacré
@ 2015-07-28 14:58 ` Dominic Sacré
3 siblings, 0 replies; 7+ messages in thread
From: Dominic Sacré @ 2015-07-28 14:58 UTC (permalink / raw)
To: openembedded-core
These patches are not referenced in any of the Python recipes.
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
---
.../python3/06-ctypes-libffi-fix-configure.patch | 44 ---------------
.../python/python3/fix-ast.h-dependency.patch | 26 ---------
.../python3/pip_build_directory_unclean.patch | 28 ----------
...python3-fix-build-error-with-Readline-6.3.patch | 62 ----------------------
.../python/python3/remove_sqlite_rpath.patch | 19 -------
5 files changed, 179 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch
delete mode 100644 meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch
delete mode 100644 meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch
delete mode 100644 meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch
delete mode 100644 meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch
diff --git a/meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch b/meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch
deleted file mode 100644
index abd63d2..0000000
--- a/meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This fixes configure issues with recent autoconf, e.g:
- autoreconf: Entering directory `Modules/_ctypes/libffi'
- autoreconf: configure.ac: not using Gettext
- autoreconf: running: aclocal --force
- configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS
- configure.ac:26: the top level
-
-The problem is still present in python-2.6.5 but fixed in python-svn.
-
-Upstream-Status: Accepted [python-svn]
-
-Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
-Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-
-2011/09/29
-Rebased for python 2.7.2
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-
-
-Index: Python-2.7.2/Modules/_ctypes/libffi/Makefile.am
-===================================================================
---- Python-2.7.2.orig/Modules/_ctypes/libffi/Makefile.am
-+++ Python-2.7.2/Modules/_ctypes/libffi/Makefile.am
-@@ -2,7 +2,7 @@
-
- AUTOMAKE_OPTIONS = foreign subdir-objects
-
--SUBDIRS = include testsuite man
-+SUBDIRS = include
-
- EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
- src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
-@@ -34,8 +34,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
- libtool-version ChangeLog.libffi m4/libtool.m4 \
- m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
-
--info_TEXINFOS = doc/libffi.texi
--
- ## ################################################################
-
- ##
diff --git a/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch b/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch
deleted file mode 100644
index 77c220a..0000000
--- a/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix a missed dependency on ast.h which can result in race condition
-at high parallel build
-
-It fixed here
-
-http://hg.python.org/cpython/rev/cfe0a293551f
-
-[YOCTO #5884]
-
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: Python-3.3.3/Makefile.pre.in
-===================================================================
---- Python-3.3.3.orig/Makefile.pre.in 2014-02-26 09:33:13.868288863 -0800
-+++ Python-3.3.3/Makefile.pre.in 2014-02-26 09:36:27.348292492 -0800
-@@ -853,7 +853,8 @@
- $(srcdir)/Include/warnings.h \
- $(srcdir)/Include/weakrefobject.h \
- pyconfig.h \
-- $(PARSER_HEADERS)
-+ $(PARSER_HEADERS) \
-+ $(AST_H)
-
- $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
-
diff --git a/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch b/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch
deleted file mode 100644
index c0c4617..0000000
--- a/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: Python-3.4.2/Lib/ensurepip/__init__.py
-===================================================================
---- Python-3.4.2.orig/Lib/ensurepip/__init__.py
-+++ Python-3.4.2/Lib/ensurepip/__init__.py
-@@ -3,6 +3,7 @@ import os.path
- import pkgutil
- import sys
- import tempfile
-+import pwd
-
-
- __all__ = ["version", "bootstrap"]
-@@ -36,6 +37,15 @@ def _run_pip(args, additional_paths=None
- if additional_paths is not None:
- sys.path = additional_paths + sys.path
-
-+ # Explicitly make sure pip build directory was left clean
-+ user = pwd.getpwuid(os.getuid())[0]
-+ if os.path.exists("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt"):
-+ os.remove("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt")
-+ try:
-+ os.rmdir("/tmp/pip_build_" + user + "/")
-+ except OSError:
-+ print("Error: Pip build directory (%s) was left unclean, make sure it is clean before continuing\n" % ("/tmp/pip_build_" + user + "/"))
-+
- # Install the bundled software
- import pip
- pip.main(args)
diff --git a/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch b/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch
deleted file mode 100644
index 44e2b7e..0000000
--- a/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-python3: fix build error with Readline 6.3
-
-Backport two patches from upstream:
-
-use new readline function types (closes #20374)
-Issue #20374: Avoid compiler warnings when compiling readline with libedit.
-
-Upstream-Status: Backport
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- Modules/readline.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/Modules/readline.c b/Modules/readline.c
-index 096c6d1..1646ef8 100644
---- a/Modules/readline.c
-+++ b/Modules/readline.c
-@@ -773,15 +773,24 @@ on_hook(PyObject *func)
- return result;
- }
-
-+
- static int
-+#if defined(_RL_FUNCTION_TYPEDEF)
- on_startup_hook(void)
-+#else
-+on_startup_hook()
-+#endif
- {
- return on_hook(startup_hook);
- }
-
- #ifdef HAVE_RL_PRE_INPUT_HOOK
- static int
-+#if defined(_RL_FUNCTION_TYPEDEF)
- on_pre_input_hook(void)
-+#else
-+on_pre_input_hook()
-+#endif
- {
- return on_hook(pre_input_hook);
- }
-@@ -936,12 +945,12 @@ setup_readline(void)
- rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
- rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
- /* Set our hook functions */
-- rl_startup_hook = (Function *)on_startup_hook;
-+ rl_startup_hook = (rl_hook_func_t *)on_startup_hook;
- #ifdef HAVE_RL_PRE_INPUT_HOOK
-- rl_pre_input_hook = (Function *)on_pre_input_hook;
-+ rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook;
- #endif
- /* Set our completion function */
-- rl_attempted_completion_function = (CPPFunction *)flex_complete;
-+ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete;
- /* Set Python word break characters */
- completer_word_break_characters =
- rl_completer_word_break_characters =
---
-1.7.9.5
-
diff --git a/meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch b/meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch
deleted file mode 100644
index 4ec627e..0000000
--- a/meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch removes the RPATH setting which contains a pointer to
-the target relocated sysroot, which is incorrect.
-
-Upstream-Status: Inappropriate [Embedded Specific]
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: Python-2.6.6/setup.py
-===================================================================
---- Python-2.6.6.orig/setup.py 2011-09-28 14:22:57.000000000 -0700
-+++ Python-2.6.6/setup.py 2011-09-28 16:11:25.147279633 -0700
-@@ -1079,7 +1079,6 @@
- include_dirs=["Modules/_sqlite",
- sqlite_incdir],
- library_dirs=sqlite_libdir,
-- runtime_library_dirs=sqlite_libdir,
- extra_link_args=sqlite_extra_link_args,
- libraries=["sqlite3",]))
- else:
--
2.4.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] python3: remove package python3-robotparser
2015-07-28 14:58 ` [PATCH 2/4] python3: remove package python3-robotparser Dominic Sacré
@ 2015-08-09 1:02 ` Khem Raj
2015-08-09 10:58 ` Dominic Sacré
0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2015-08-09 1:02 UTC (permalink / raw)
To: Dominic Sacré; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 8763 bytes --]
> On Jul 28, 2015, at 7:58 AM, Dominic Sacré <dominic.sacre@gmx.de> wrote:
>
> robotparser has been moved to urllib.robotparser in Python 3, and gets
> packaged as part of python3-netclient alongside the rest of urllib.
> This causes python3-modules to depend on an empty/missing
> python3-robotparser package.
>
> robotparser.py is relatively small and has no dependencies outside
> urllib, so it makes more sense to eliminate the python3-robotparser
> package than to alter the manifest for python3-netclient.
>
> Part of the fix for [YOCTO #8048].
>
> Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
> ---
> meta/recipes-devtools/python/python-3.4-manifest.inc | 10 +++-------
> scripts/contrib/python/generate-manifest-3.4.py | 3 ---
> 2 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc b/meta/recipes-devtools/python/python-3.4-manifest.inc
> index 557acdf..77f0125 100644
> --- a/meta/recipes-devtools/python/python-3.4-manifest.inc
> +++ b/meta/recipes-devtools/python/python-3.4-manifest.inc
this file is auto generated. So did you regenerate it ?
> @@ -5,9 +5,9 @@
>
>
>
> -PROVIDES+="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
> +PROVIDES+="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
>
> -PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-modules"
> +PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-modules"
>
> SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator"
> RDEPENDS_${PN}-2to3="${PN}-core"
> @@ -197,10 +197,6 @@ SUMMARY_${PN}-resource="Python resource control interface"
> RDEPENDS_${PN}-resource="${PN}-core"
> FILES_${PN}-resource="${libdir}/python3.4/lib-dynload/resource.*.so "
>
> -SUMMARY_${PN}-robotparser="Python robots.txt parser"
> -RDEPENDS_${PN}-robotparser="${PN}-core ${PN}-netclient"
> -FILES_${PN}-robotparser="${libdir}/python3.4/urllib/robotparser.* "
> -
> SUMMARY_${PN}-shell="Python shell-like functionality"
> RDEPENDS_${PN}-shell="${PN}-core ${PN}-re"
> FILES_${PN}-shell="${libdir}/python3.4/cmd.* ${libdir}/python3.4/commands.* ${libdir}/python3.4/dircache.* ${libdir}/python3.4/fnmatch.* ${libdir}/python3.4/glob.* ${libdir}/python3.4/popen2.* ${libdir}/python3.4/shlex.* ${libdir}/python3.4/shutil.* "
> @@ -266,7 +262,7 @@ RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang"
> FILES_${PN}-xmlrpc="${libdir}/python3.4/xmlrpclib.* ${libdir}/python3.4/SimpleXMLRPCServer.* ${libdir}/python3.4/DocXMLRPCServer.* ${libdir}/python3.4/xmlrpc "
>
> SUMMARY_${PN}-modules="All Python modules"
> -RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
> +RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc "
> ALLOW_EMPTY_${PN}-modules = "1"
>
>
> diff --git a/scripts/contrib/python/generate-manifest-3.4.py b/scripts/contrib/python/generate-manifest-3.4.py
> index 569fd3c..42c851c 100755
> --- a/scripts/contrib/python/generate-manifest-3.4.py
> +++ b/scripts/contrib/python/generate-manifest-3.4.py
> @@ -343,9 +343,6 @@ if __name__ == "__main__":
> m.addPackage( "${PN}-shell", "Python shell-like functionality", "${PN}-core ${PN}-re",
> "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
>
> - m.addPackage( "${PN}-robotparser", "Python robots.txt parser", "${PN}-core ${PN}-netclient",
> - "urllib/robotparser.*")
> -
> m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle",
> "subprocess.*" )
>
> --
> 2.4.6
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] python3: remove package python3-robotparser
2015-08-09 1:02 ` Khem Raj
@ 2015-08-09 10:58 ` Dominic Sacré
0 siblings, 0 replies; 7+ messages in thread
From: Dominic Sacré @ 2015-08-09 10:58 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On 2015-08-09 03:02, Khem Raj wrote:
>> On Jul 28, 2015, at 7:58 AM, Dominic Sacré <dominic.sacre@gmx.de> wrote:
>>
>> robotparser has been moved to urllib.robotparser in Python 3, and gets
>> packaged as part of python3-netclient alongside the rest of urllib.
>> This causes python3-modules to depend on an empty/missing
>> python3-robotparser package.
>>
>> robotparser.py is relatively small and has no dependencies outside
>> urllib, so it makes more sense to eliminate the python3-robotparser
>> package than to alter the manifest for python3-netclient.
>>
>> Part of the fix for [YOCTO #8048].
>>
>> Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
>> ---
>> meta/recipes-devtools/python/python-3.4-manifest.inc | 10 +++-------
>> scripts/contrib/python/generate-manifest-3.4.py | 3 ---
>> 2 files changed, 3 insertions(+), 10 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc b/meta/recipes-devtools/python/python-3.4-manifest.inc
>> index 557acdf..77f0125 100644
>> --- a/meta/recipes-devtools/python/python-3.4-manifest.inc
>> +++ b/meta/recipes-devtools/python/python-3.4-manifest.inc
>
> this file is auto generated. So did you regenerate it ?
The changes to scripts/contrib/python/generate-manifest-3.4.py are
included in the same patch:
>> diff --git a/scripts/contrib/python/generate-manifest-3.4.py b/scripts/contrib/python/generate-manifest-3.4.py
>> index 569fd3c..42c851c 100755
>> --- a/scripts/contrib/python/generate-manifest-3.4.py
>> +++ b/scripts/contrib/python/generate-manifest-3.4.py
>> @@ -343,9 +343,6 @@ if __name__ == "__main__":
>> m.addPackage( "${PN}-shell", "Python shell-like functionality", "${PN}-core ${PN}-re",
>> "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
>>
>> - m.addPackage( "${PN}-robotparser", "Python robots.txt parser", "${PN}-core ${PN}-netclient",
>> - "urllib/robotparser.*")
>> -
>> m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle",
>> "subprocess.*" )
I ran the modified script to update python-3.4-manifest.inc, then
added both files to my commit. Is there something I've missed?
Dominic
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-08-09 10:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-28 14:58 [PATCH 0/4] python3: fix building extension modules, make python3-modules installable Dominic Sacré
2015-07-28 14:58 ` [PATCH 1/4] python3: detect libraries in STAGING_LIBDIR Dominic Sacré
2015-07-28 14:58 ` [PATCH 2/4] python3: remove package python3-robotparser Dominic Sacré
2015-08-09 1:02 ` Khem Raj
2015-08-09 10:58 ` Dominic Sacré
2015-07-28 14:58 ` [PATCH 3/4] python3: remove 2to3 symlink from package python3-2to3 Dominic Sacré
2015-07-28 14:58 ` [PATCH 4/4] python3: delete patches that don't get applied anywhere Dominic Sacré
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.