From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH 4/5] telepathy-python: add (moved from oe-core)
Date: Wed, 31 Dec 2014 16:43:39 +0100 [thread overview]
Message-ID: <20141231154339.GD2469@jama> (raw)
In-Reply-To: <1419947615-27947-4-git-send-email-ross.burton@intel.com>
[-- Attachment #1: Type: text/plain, Size: 8548 bytes --]
On Tue, Dec 30, 2014 at 01:53:34PM +0000, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> .../telepathy-python-0.15.19/parallel_make.patch | 43 ++++++++++++++++++++
> .../remove_duplicate_install.patch | 26 ++++++++++++
> .../telepathy-python_fix_for_automake_1.12.patch | 26 ++++++++++++
> .../telepathy/telepathy-python_0.15.19.bb | 32 +++++++++++++++
> 4 files changed, 127 insertions(+)
> create mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
> create mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
> create mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
> create mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
>
> diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
> new file mode 100644
> index 0000000..2488246
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
> @@ -0,0 +1,43 @@
> +Add dependency of __init__.py
> +
> +Tasks must be done after exec of __init__, which creates the
> +src/_generated directory that tasks are based on.
> +
> +Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> +
> +Upstream-Status: Submitted
> +(However it seems that this project is out of maintanence.)
> +
> +diff -ruN telepathy-python-0.15.19-orig/src/Makefile.am telepathy-python-0.15.19/src/Makefile.am
> +--- telepathy-python-0.15.19-orig/src/Makefile.am 2011-03-10 08:51:49.000000000 +0800
> ++++ telepathy-python-0.15.19/src/Makefile.am 2011-03-10 08:54:45.000000000 +0800
> +@@ -39,17 +39,17 @@
> + XSLTPROC_OPTS = --nonet --novalid --xinclude
> + tools_dir = $(top_srcdir)/tools
> +
> +-_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
> ++_generated/interfaces.py: _generated/__init__.py $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
> + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
> + $(tools_dir)/python-interfaces-generator.xsl \
> + $(spec_dir)/all.xml
> +
> +-_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
> ++_generated/constants.py: _generated/__init__.py $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
> + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
> + $(tools_dir)/python-constants-generator.xsl \
> + $(spec_dir)/all.xml
> +
> +-_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
> ++_generated/errors.py: _generated/__init__.py $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
> + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
> + $(tools_dir)/python-errors-generator.xsl \
> + $(spec_dir)/all.xml
> +@@ -58,7 +58,7 @@
> + $(AM_V_GEN)$(mkdir_p) $(dir $@)
> + @echo "# Placeholder for package" > $@
> +
> +-_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
> ++_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
> + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
> + $(tools_dir)/spec-to-python.xsl \
> + $(spec_dir)/$*.xml
> diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
> new file mode 100644
> index 0000000..df95a4c
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
> @@ -0,0 +1,26 @@
> +commit f6c67662145de889055a86a6b3b12c70a45fc8d5
> +Author: Dongxiao Xu <dongxiao.xu@intel.com>
> +Date: Wed Sep 7 16:02:20 2011 +0800
> +
> + Avoid duplicated installation of errors.py
> +
> + newer version of autotools don't seem to like listing files to install
> + twice. Remove one errors.py from the installation list.
> +
> + Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> +
> + Upstream-Status: Inappropirate [upstream inactive]
> +
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 5c27dfe..7536e43 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -11,7 +11,7 @@ telepathy_PYTHON = \
> +
> + # telepathy._generated.* auto-generated modules
> + spec_dir = $(top_srcdir)/spec
> +-spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
> ++spec_files := $(filter-out _generated/errors.py, $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)))
> +
> + BUILT_SOURCES = \
> + _generated/interfaces.py \
> diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
> new file mode 100644
> index 0000000..f613fdc
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
> @@ -0,0 +1,26 @@
> +Upstream-Status: Pending
> +
> +automake 1.12 has deprecated use of mkdir_p, and it recommends
> +use of MKDIR_P instead. Changed the code to avoid these kind
> +of warning-errors.
> +
> +| make[1]: _generated/: Command not found
> +| make[1]: *** [_generated/__init__.py] Error 127
> +| make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src'
> +| make: *** [all-recursive] Error 1
> +
> +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> +2012/07/10
> +Index: telepathy-python-0.15.19/src/Makefile.am
> +===================================================================
> +--- telepathy-python-0.15.19.orig/src/Makefile.am
> ++++ telepathy-python-0.15.19/src/Makefile.am
> +@@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_
> + $(spec_dir)/all.xml
> +
> + _generated/__init__.py:
> +- $(AM_V_GEN)$(mkdir_p) $(dir $@)
> ++ $(AM_V_GEN)$(MKDIR_P) $(dir $@)
> + @echo "# Placeholder for package" > $@
> +
> + _generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
> diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
> new file mode 100644
> index 0000000..1716702
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
> @@ -0,0 +1,32 @@
> +SUMMARY = "Telepathy IM framework - Python package"
> +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
> +LICENSE = "LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> + file://src/utils.py;beginline=1;endline=17;md5=9a07d1a9791a7429a14e7b25c6c86822"
> +
> +DEPENDS = "libxslt-native"
> +RDEPENDS_${PN} += "python-dbus"
> +
> +SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
> + file://parallel_make.patch \
> + file://remove_duplicate_install.patch \
> + file://telepathy-python_fix_for_automake_1.12.patch"
> +
> +PR = "r6"
> +
> +inherit autotools pythonnative
> +
> +SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017"
> +SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376"
> +
> +FILES_${PN} += "\
> + ${libdir}/python*/site-packages/telepathy/*.py \
> + ${libdir}/python*/site-packages/telepathy/*/*.py \
> + "
> +
> +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
> +}
I've fixed indentation when cherry-picking this to master-next.
> --
> 1.7.10.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
next prev parent reply other threads:[~2014-12-31 15:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-30 13:53 [PATCH 1/5] libtelepathy: add (moving from oe-core) Ross Burton
2014-12-30 13:53 ` [PATCH 2/5] telepathy-glib: " Ross Burton
2014-12-30 13:53 ` [PATCH 3/5] telepathy-idle: add (moved " Ross Burton
2014-12-30 13:53 ` [PATCH 4/5] telepathy-python: " Ross Burton
2014-12-31 15:43 ` Martin Jansa [this message]
2014-12-30 13:53 ` [PATCH 5/5] telepathy-mission-control: " Ross Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141231154339.GD2469@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.