* [PATCH 0/1][PULL] telepathy-python: remove duplicated installation entry of errors.py
@ 2011-09-07 8:18 Dongxiao Xu
2011-09-07 8:18 ` [PATCH 1/1] telepathy-python: avoid duplicated installation " Dongxiao Xu
0 siblings, 1 reply; 3+ messages in thread
From: Dongxiao Xu @ 2011-09-07 8:18 UTC (permalink / raw)
To: openembedded-core
Hi Richard and Saul,
This pull request is to fix [YOCTO #1453], please help to review and pull.
Thanks,
Dongxiao
The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:
icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/bugfix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/bugfix
Dongxiao Xu (1):
telepathy-python: avoid duplicated installation of errors.py
.../remove_duplicate_install.patch | 26 ++++++++++++++++++++
.../telepathy/telepathy-python_0.15.19.bb | 5 ++-
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] telepathy-python: avoid duplicated installation of errors.py
2011-09-07 8:18 [PATCH 0/1][PULL] telepathy-python: remove duplicated installation entry of errors.py Dongxiao Xu
@ 2011-09-07 8:18 ` Dongxiao Xu
2011-09-07 21:58 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Dongxiao Xu @ 2011-09-07 8:18 UTC (permalink / raw)
To: openembedded-core
telepathy-python install fails on latest Fedora 16 due to the tighter
check of duplicated file installation.
Remove one errors.py entry in Makefile.am to fix this issue.
[YOCTO #1453]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../remove_duplicate_install.patch | 26 ++++++++++++++++++++
.../telepathy/telepathy-python_0.15.19.bb | 5 ++-
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
new file mode 100644
index 0000000..df95a4c
--- /dev/null
+++ b/meta/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/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
index ead8dea..817b911 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
RDEPENDS_${PN} += "python-dbus"
SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
- file://parallel_make.patch"
+ file://parallel_make.patch \
+ file://remove_duplicate_install.patch"
-PR = "r2"
+PR = "r3"
inherit autotools
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] telepathy-python: avoid duplicated installation of errors.py
2011-09-07 8:18 ` [PATCH 1/1] telepathy-python: avoid duplicated installation " Dongxiao Xu
@ 2011-09-07 21:58 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-09-07 21:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-09-07 at 16:18 +0800, Dongxiao Xu wrote:
> telepathy-python install fails on latest Fedora 16 due to the tighter
> check of duplicated file installation.
>
> Remove one errors.py entry in Makefile.am to fix this issue.
>
> [YOCTO #1453]
>
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
> .../remove_duplicate_install.patch | 26 ++++++++++++++++++++
> .../telepathy/telepathy-python_0.15.19.bb | 5 ++-
> 2 files changed, 29 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-07 22:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-07 8:18 [PATCH 0/1][PULL] telepathy-python: remove duplicated installation entry of errors.py Dongxiao Xu
2011-09-07 8:18 ` [PATCH 1/1] telepathy-python: avoid duplicated installation " Dongxiao Xu
2011-09-07 21:58 ` Richard Purdie
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.