From b5e9dbbe8245f47d2d3d77f219a2d30a48e1918b Mon Sep 17 00:00:00 2001 From: Dominic Sacré Date: Tue, 28 Jul 2015 16:58:37 +0200 Subject: python3: remove 2to3 symlink from package python3-2to3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-3.4-manifest.inc | 2 +- meta/recipes-devtools/python/python3_3.4.3.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/python') 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 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 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() { 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 -- cgit v1.2.3-54-g00ecf