diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-12-12 11:35:46 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-18 17:35:17 +0100 |
commit | ee97efeec28cca615eb29b1e8ba73d3ccf29a57e (patch) | |
tree | d21a7905d96936513a982f49ed86b9761bb8e094 | |
parent | e8874ce41f1614ac17607a169ee3370b56811911 (diff) | |
download | meta-openembedded-ee97efeec28cca615eb29b1e8ba73d3ccf29a57e.tar.gz |
gvfs-gdu-volume-monitor: avoid double packaging gvfs locale
Fix error for do_rootfs:
| Collected errors:
| * check_data_file_clashes: Package gvfs-gdu-volume-monitor-locale-fr wants to install file /home/Superandy/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/usr/share/locale/fr/LC_MESSAGES/gvfs.mo
| But that file is already provided by package * gvfs-locale-fr
| * opkg_install_cmd: Cannot install package gvfs-gdu-volume-monitor-locale-fr.
| * check_data_file_clashes: Package gvfs-locale-en-gb wants to install file /home/Superandy/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/usr/share/locale/en_GB/LC_MESSAGES/gvfs.mo
| But that file is already provided by package * gvfs-gdu-volume-monitor-locale-en-gb
| * opkg_install_cmd: Cannot install package gvfs-locale-en-gb.
| * check_data_file_clashes: Package gvfs-gdu-volume-monitor-locale-de wants to install file /home/Superandy/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/usr/share/locale/de/LC_MESSAGES/gvfs.mo
| But that file is already provided by package * gvfs-locale-de
| * opkg_install_cmd: Cannot install package gvfs-gdu-volume-monitor-locale-de.
* MJ: added PR bump
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb index fe5af469e..1939f09f2 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | |||
@@ -4,7 +4,7 @@ BPN = "gvfs" | |||
4 | 4 | ||
5 | DEPENDS = "gvfs gnome-disk-utility" | 5 | DEPENDS = "gvfs gnome-disk-utility" |
6 | 6 | ||
7 | PR = "${INC_PR}.2" | 7 | PR = "${INC_PR}.3" |
8 | 8 | ||
9 | # we need gdu files only: reduce files to delete in libexecdir | 9 | # we need gdu files only: reduce files to delete in libexecdir |
10 | EXTRA_OECONF += "--disable-gphoto2" | 10 | EXTRA_OECONF += "--disable-gphoto2" |
@@ -20,6 +20,7 @@ do_install_append() { | |||
20 | rm -rf ${D}${datadir}/glib-2.0 | 20 | rm -rf ${D}${datadir}/glib-2.0 |
21 | rm -rf ${D}${datadir}/GConf | 21 | rm -rf ${D}${datadir}/GConf |
22 | rm -f ${D}${datadir}/dbus-1/services/gvfs-* | 22 | rm -f ${D}${datadir}/dbus-1/services/gvfs-* |
23 | rm -rf ${D}${datadir}/locale | ||
23 | rm -f ${D}${libexecdir}/gvfsd* | 24 | rm -f ${D}${libexecdir}/gvfsd* |
24 | rm -f ${D}${libexecdir}/gvfs-fuse-daemon | 25 | rm -f ${D}${libexecdir}/gvfs-fuse-daemon |
25 | rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor | 26 | rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor |