Patchwork [meta-gnome] gvfs-gdu-volume-monitor: avoid double packaging gvfs locale

login
register
mail settings
Submitter Andreas Müller
Date Dec. 12, 2012, 11:35 a.m.
Message ID <1355312146-24370-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/40803/
State Accepted, archived
Headers show

Comments

Andreas Müller - Dec. 12, 2012, 11:35 a.m.
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.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb          |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Andreas Müller - Dec. 18, 2012, 3 p.m.
On Wed, Dec 12, 2012 at 12:35 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> 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.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb          |    1 +
>  1 files changed, 1 insertions(+), 0 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 fe5af46..3754e60 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
> @@ -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.7.4.4
>
ping?
Martin Jansa - Dec. 18, 2012, 3:33 p.m.
On Tue, Dec 18, 2012 at 04:00:04PM +0100, Andreas Müller wrote:
> On Wed, Dec 12, 2012 at 12:35 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > 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.
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> > ---
> >  .../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb          |    1 +
> >  1 files changed, 1 insertions(+), 0 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 fe5af46..3754e60 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
> > @@ -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.7.4.4
> >
> ping?

I've it in my queue and will send consolidated-pull request tomorrow.

Btw meta-guacamayo is using newer gvfs-1.12.3 and maybe they also
resolved
http://patchwork.openembedded.org/patch/16755/

Can you check if such upgrade would be usefull for meta-gnome too? 
I'm not using gnome..

Cheers,
Andreas Müller - Dec. 20, 2012, noon
> Btw meta-guacamayo is using newer gvfs-1.12.3 and maybe they also
> resolved
> http://patchwork.openembedded.org/patch/16755/
This one was fixed in 211c2ba382d921519761bc0d241942f927cf692e
>
> Can you check if such upgrade would be usefull for meta-gnome too?
> I'm not using gnome..
Will do that hopefully before Xmas..

Andreas
Martin Jansa - Dec. 20, 2012, 1:03 p.m.
On Thu, Dec 20, 2012 at 01:00:47PM +0100, Andreas Müller wrote:
> > Btw meta-guacamayo is using newer gvfs-1.12.3 and maybe they also
> > resolved
> > http://patchwork.openembedded.org/patch/16755/
> This one was fixed in 211c2ba382d921519761bc0d241942f927cf692e

OK, thanks, I've updated status on patchwork.

> > Can you check if such upgrade would be usefull for meta-gnome too?
> > I'm not using gnome..
> Will do that hopefully before Xmas..

Great, hopefully it will also resolve latest issue with gvfs build:
| gvfsbackendafc.c: In function '_idevice_event_cb':
| gvfsbackendafc.c:352:25: error: 'idevice_event_t' has no member named 'uuid'
| /OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux//bin/sed -e "s|\@libexecdir\@|/usr/lib/gvfs|" trash.mount.in > trash.mount
| gvfsbackendafc.c: In function 'g_vfs_backend_afc_init':
| gvfsbackendafc.c:2612:3: warning: 'g_mutex_new' is deprecated (declared at /OE/jansa-test/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include/glib-2.0/glib/deprecated/gthread.h:271) [-Wdeprecated-declarations]
| daemon-main.c: In function 'daemon_init':
| daemon-main.c:66:3: warning: 'g_thread_init' is deprecated (declared at /OE/jansa-test/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include/glib-2.0/glib/deprecated/gthread.h:259) [-Wdeprecated-declarations]
| make[4]: *** [gvfsd_afc-gvfsbackendafc.o] Error 1
| make[4]: *** Waiting for unfinished jobs....
| daemon-main.c: In function 'daemon_init':
| daemon-main.c:66:3: warning: 'g_thread_init' is deprecated (declared at /OE/jansa-test/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include/glib-2.0/glib/deprecated/gthread.h:259) [-Wdeprecated-declarations]
| make[4]: Leaving directory `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gvfs/1.8.2-r8.0/gvfs-1.8.2/daemon'
| make[3]: *** [all-recursive] Error 1
| make[3]: Leaving directory `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gvfs/1.8.2-r8.0/gvfs-1.8.2/daemon'
| make[2]: *** [all] Error 2
| make[2]: Leaving directory `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gvfs/1.8.2-r8.0/gvfs-1.8.2/daemon'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gvfs/1.8.2-r8.0/gvfs-1.8.2'
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| ERROR: Function failed: do_compile (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gvfs/1.8.2-r8.0/temp/log.do_compile.12803 for further information)
NOTE: recipe gvfs-1.8.2-r8.0: task do_compile: Failed
ERROR: Task 13097 (/OE/jansa-test/shr-core/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb, do_compile) failed with exit code '1'

Or we can backport something like:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
and enable/disable libimobiledevice support explicitly.

Also as you're doing a lot of changes in meta-gnome and I guess you're
also using it, can you check meta-gnome issues from "[oe] [OE-core]
State of bitbake world" thread?
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-December/042964.html

Some are probably caused because building libnotify3 and libnotify
together doesn't play well with some apps, but some are pretty easy to
reproduce (like failing do_patch).

Cheers,
Andreas Müller - Dec. 20, 2012, 8:21 p.m.
On Thu, Dec 20, 2012 at 2:03 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Dec 20, 2012 at 01:00:47PM +0100, Andreas Müller wrote:
>> > Btw meta-guacamayo is using newer gvfs-1.12.3 and maybe they also
>> > resolved
>> > http://patchwork.openembedded.org/patch/16755/
>> This one was fixed in 211c2ba382d921519761bc0d241942f927cf692e
>
> OK, thanks, I've updated status on patchwork.
>
>> > Can you check if such upgrade would be usefull for meta-gnome too?
>> > I'm not using gnome..
>> Will do that hopefully before Xmas..
>
FYI: I updated to latest stable (1.14.2) and had some tests.
Unfortunately this causes xfce/thunar automount fail. So this is not
as easy as expected.

Will try 1.12.3...

Andreas
Andreas Müller - Dec. 20, 2012, 10:51 p.m.
On Thu, Dec 20, 2012 at 9:21 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Thu, Dec 20, 2012 at 2:03 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Thu, Dec 20, 2012 at 01:00:47PM +0100, Andreas Müller wrote:
>>> > Btw meta-guacamayo is using newer gvfs-1.12.3 and maybe they also
>>> > resolved
>>> > http://patchwork.openembedded.org/patch/16755/
>>> This one was fixed in 211c2ba382d921519761bc0d241942f927cf692e
>>
>> OK, thanks, I've updated status on patchwork.
>>
>>> > Can you check if such upgrade would be usefull for meta-gnome too?
>>> > I'm not using gnome..
>>> Will do that hopefully before Xmas..
>>
> FYI: I updated to latest stable (1.14.2) and had some tests.
> Unfortunately this causes xfce/thunar automount fail. So this is not
> as easy as expected.
>
> Will try 1.12.3...
>
> Andreas
OK I checked: All stable gvfs versions > 1.8.2 require
gnome-disk-utility > 3.x which requires gtk3. I would prefer to stay
on gvfs 1.8.2.

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..3754e60 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
@@ -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