diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-09-07 16:18:06 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-07 22:28:40 +0100 |
| commit | d84fd7c1e90f080ea0c702cba9a9f81a2c465ee6 (patch) | |
| tree | afe1980cd5ad08f7e0a788f941a745ad9e2ec625 /meta/recipes-connectivity/telepathy | |
| parent | acfe8c657dd2496ae8669ce69def96a0b04d061c (diff) | |
| download | openembedded-core-d84fd7c1e90f080ea0c702cba9a9f81a2c465ee6.tar.gz openembedded-core-d84fd7c1e90f080ea0c702cba9a9f81a2c465ee6.tar.bz2 openembedded-core-d84fd7c1e90f080ea0c702cba9a9f81a2c465ee6.zip | |
telepathy-python: avoid duplicated installation of errors.py
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/telepathy')
| -rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb | 5 |
2 files changed, 29 insertions, 2 deletions
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 0000000000..df95a4c138 --- /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 ead8dea05b..817b911eae 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 |