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.sa...@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
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
