From e134e4c1b7055212c81749e2ab2a7a7c179863fa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 21 Jan 2020 13:24:44 -0800 Subject: [PATCH] telepathy-python: Rename to telepathy-python3 This avoid recipe conflict with py2 version and adjust to delete __pycache__ files which are py3 specific Signed-off-by: Khem Raj --- .../parallel_make.patch | 0 .../remove_duplicate_install.patch | 0 .../telepathy-python_fix_for_automake_1.12.patch | 0 ...ython_0.15.19.bb => telepathy-python3_0.15.19.bb} | 12 +++++++----- 4 files changed, 7 insertions(+), 5 deletions(-) rename meta-python/recipes-connectivity/telepathy/{telepathy-python-0.15.19 => telepathy-python3-0.15.19}/parallel_make.patch (100%) rename meta-python/recipes-connectivity/telepathy/{telepathy-python-0.15.19 => telepathy-python3-0.15.19}/remove_duplicate_install.patch (100%) rename meta-python/recipes-connectivity/telepathy/{telepathy-python-0.15.19 => telepathy-python3-0.15.19}/telepathy-python_fix_for_automake_1.12.patch (100%) rename meta-python/recipes-connectivity/telepathy/{telepathy-python_0.15.19.bb => telepathy-python3_0.15.19.bb} (66%) diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/parallel_make.patch similarity index 100% rename from meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch rename to meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/parallel_make.patch diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch similarity index 100% rename from meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch rename to meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch similarity index 100% rename from meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch rename to meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb similarity index 66% rename from meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb rename to meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb index 2e8da0805d..11ac0d93a1 100644 --- a/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +++ b/meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb @@ -7,13 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ DEPENDS = "libxslt-native" RDEPENDS_${PN} += "python-dbus" -SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${PV}.tar.gz \ file://parallel_make.patch \ file://remove_duplicate_install.patch \ file://telepathy-python_fix_for_automake_1.12.patch" PR = "r6" +S = "${WORKDIR}/telepathy-python-${PV}" + inherit autotools python3native SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017" @@ -25,8 +27,8 @@ FILES_${PN} += "\ " do_install_append () { - rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyc - rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyo - rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyc - rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyo + rm -fr ${D}${libdir}/python*/site-packages/telepathy/__pycache__ + rm -fr ${D}${libdir}/python*/site-packages/telepathy/__pycache__ + rm -fr ${D}${libdir}/python*/site-packages/telepathy/*/__pycache__ + rm -fr ${D}${libdir}/python*/site-packages/telepathy/*/__pycache__ }