summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-07-28 16:58:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 22:24:18 +0100
commitb5e9dbbe8245f47d2d3d77f219a2d30a48e1918b (patch)
treeced58e083aa352525edd5818d36d5e5a1ac03b92
parent0b69680a3385aeac76311ba4301fd5149dc2c1ad (diff)
downloadpoky-b5e9dbbe8245f47d2d3d77f219a2d30a48e1918b.tar.gz
python3: remove 2to3 symlink from package python3-2to3
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. (From OE-Core rev: ff3633fa6a379d502f65b20d6a57d30c59f09ab6) Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-3.4-manifest.inc2
-rw-r--r--meta/recipes-devtools/python/python3_3.4.3.bb3
-rwxr-xr-xscripts/contrib/python/generate-manifest-3.4.py2
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 77f01254e2..07e1490273 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
11 11
12SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator" 12SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator"
13RDEPENDS_${PN}-2to3="${PN}-core" 13RDEPENDS_${PN}-2to3="${PN}-core"
14FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python3.4/lib2to3 " 14FILES_${PN}-2to3="${libdir}/python3.4/lib2to3 "
15 15
16SUMMARY_${PN}-asyncio="Python Asynchronous I/O, event loop, coroutines and tasks" 16SUMMARY_${PN}-asyncio="Python Asynchronous I/O, event loop, coroutines and tasks"
17RDEPENDS_${PN}-asyncio="${PN}-core" 17RDEPENDS_${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 e2d9f796f1..6c2e21d6a9 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() {
162 ARCH=${TARGET_ARCH} \ 162 ARCH=${TARGET_ARCH} \
163 DESTDIR=${D} LIBDIR=${libdir} install 163 DESTDIR=${D} LIBDIR=${libdir} install
164 164
165 # avoid conflict with 2to3 from Python 2
166 rm -f ${D}/${bindir}/2to3
167
165 install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile 168 install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
166 169
167 if [ -e ${WORKDIR}/sitecustomize.py ]; then 170 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 42c851c11a..06eecdc5d0 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__":
194 "${datadir}/pkgconfig " ) 194 "${datadir}/pkgconfig " )
195 195
196 m.addPackage( "${PN}-2to3", "Python automated Python 2 to 3 code translator", "${PN}-core", 196 m.addPackage( "${PN}-2to3", "Python automated Python 2 to 3 code translator", "${PN}-core",
197 "${bindir}/2to3 lib2to3" ) # package 197 "lib2to3" ) # package
198 198
199 m.addPackage( "${PN}-idle", "Python Integrated Development Environment", "${PN}-core ${PN}-tkinter", 199 m.addPackage( "${PN}-idle", "Python Integrated Development Environment", "${PN}-core ${PN}-tkinter",
200 "${bindir}/idle idlelib" ) # package 200 "${bindir}/idle idlelib" ) # package