Patchwork [meta-oe,08/10] gvfs-gdu-volume-monitor: avoid double packaging gvfs locale

login
register
mail settings
Submitter Martin Jansa
Date Dec. 18, 2012, 4:55 p.m.
Message ID <ee97efeec28cca615eb29b1e8ba73d3ccf29a57e.1355849280.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/41279/
State Accepted
Commit ee97efeec28cca615eb29b1e8ba73d3ccf29a57e
Headers show

Comments

Martin Jansa - Dec. 18, 2012, 4:55 p.m.
From: Andreas Müller <schnitzeltony@googlemail.com>

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>
---
 meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Andreas Müller - Dec. 18, 2012, 5:33 p.m.
On Tue, Dec 18, 2012 at 5:55 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> From: Andreas Müller <schnitzeltony@googlemail.com>
>
> 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>
> ---
>  meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> 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 fe5af46..1939f09 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"
>
>  DEPENDS = "gvfs gnome-disk-utility"
>
> -PR = "${INC_PR}.2"
> +PR = "${INC_PR}.3"
>
>  # we need gdu files only: reduce files to delete in libexecdir
>  EXTRA_OECONF += "--disable-gphoto2"
> @@ -20,6 +20,7 @@ do_install_append() {
>         rm -rf ${D}${datadir}/glib-2.0
>         rm -rf ${D}${datadir}/GConf
>         rm -f ${D}${datadir}/dbus-1/services/gvfs-*
> +       rm -rf ${D}${datadir}/locale
>         rm -f ${D}${libexecdir}/gvfsd*
>         rm -f ${D}${libexecdir}/gvfs-fuse-daemon
>         rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor
> --
> 1.8.0.2
>
>
* Thanks for PR bump - it should go in with this
* after that I will check for new version
* off-topic: I wonder why I have it in my xfce-images can't find a
dependency matching - will check that too

Andreas

Patch

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 fe5af46..1939f09 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"
 
 DEPENDS = "gvfs gnome-disk-utility"
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 # we need gdu files only: reduce files to delete in libexecdir
 EXTRA_OECONF += "--disable-gphoto2"
@@ -20,6 +20,7 @@  do_install_append() {
 	rm -rf ${D}${datadir}/glib-2.0
 	rm -rf ${D}${datadir}/GConf
 	rm -f ${D}${datadir}/dbus-1/services/gvfs-*
+	rm -rf ${D}${datadir}/locale
 	rm -f ${D}${libexecdir}/gvfsd*
 	rm -f ${D}${libexecdir}/gvfs-fuse-daemon
 	rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor