Patchwork [meta-gnome] gnome-control-center: fix unshipped packages

login
register
mail settings
Submitter Andreas Müller
Date Nov. 1, 2011, 11:56 a.m.
Message ID <1320148597-10157-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/14127/
State Rejected
Headers show

Comments

Andreas Müller - Nov. 1, 2011, 11:56 a.m.
warnings fixed:
WARNING: For recipe gnome-control-center, the following files were installed but not shipped in any package:
WARNING:   /usr/share/mime/XMLnamespaces
WARNING:   /usr/share/mime/version
WARNING:   /usr/share/mime/subclasses
WARNING:   /usr/share/mime/globs2
WARNING:   /usr/share/mime/globs
WARNING:   /usr/share/mime/types
WARNING:   /usr/share/mime/mime.cache
WARNING:   /usr/share/mime/icons
WARNING:   /usr/share/mime/generic-icons
WARNING:   /usr/share/mime/treemagic
WARNING:   /usr/share/mime/magic
WARNING:   /usr/share/mime/aliases

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../gnome-control-center_2.32.1.bb                 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Koen Kooi - Nov. 1, 2011, 11:59 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 01-11-11 12:56, Andreas Müller schreef:
> warnings fixed: WARNING: For recipe gnome-control-center, the following
> files were installed but not shipped in any package: WARNING:
> /usr/share/mime/XMLnamespaces WARNING:   /usr/share/mime/version WARNING:
> /usr/share/mime/subclasses WARNING:   /usr/share/mime/globs2 WARNING:
> /usr/share/mime/globs WARNING:   /usr/share/mime/types WARNING:
> /usr/share/mime/mime.cache WARNING:   /usr/share/mime/icons WARNING:
> /usr/share/mime/generic-icons WARNING:   /usr/share/mime/treemagic 
> WARNING:   /usr/share/mime/magic WARNING:   /usr/share/mime/aliases

THose aren't meant to be shipped, mime.bbclass should already package the
stuff it needs.

regards,

Koen




-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOr98aMkyGM64RGpERAiqiAJ0de3cEOkFsbd+y3ntGzdXsZttZoACgnJVR
a1WkZc370ABW6dHLS/AxAZE=
=m2Bq
-----END PGP SIGNATURE-----
Koen Kooi - Nov. 1, 2011, 1:28 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 01-11-11 14:30, Andreas Müller schreef:
> On Tuesday, November 01, 2011 12:59:22 PM Koen Kooi wrote:
>> Op 01-11-11 12:56, Andreas Müller schreef:
>>> warnings fixed: WARNING: For recipe gnome-control-center, the 
>>> following files were installed but not shipped in any package: 
>>> WARNING: /usr/share/mime/XMLnamespaces WARNING: 
>>> /usr/share/mime/version WARNING: /usr/share/mime/subclasses WARNING: 
>>> /usr/share/mime/globs2 WARNING: /usr/share/mime/globs WARNING: 
>>> /usr/share/mime/types WARNING: /usr/share/mime/mime.cache WARNING: 
>>> /usr/share/mime/icons WARNING: /usr/share/mime/generic-icons
>>> WARNING: /usr/share/mime/treemagic WARNING:   /usr/share/mime/magic
>>> WARNING: /usr/share/mime/aliases
>> 
>> THose aren't meant to be shipped, mime.bbclass should already package 
>> the stuff it needs.
> How about adding a dummy package gnome-control-center-mime to clean up 
> log and keep further enthusiastic patchers away?

I'd suggest rm'ing them in do_install

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOr/PwMkyGM64RGpERAjcOAJ9IIXTIym9euwpKobGw7aW6DSdr9QCeJwGy
Yv/IzPTNjBobD/eoFd7NnaA=
=KwIu
-----END PGP SIGNATURE-----
Andreas Müller - Nov. 1, 2011, 1:30 p.m.
On Tuesday, November 01, 2011 12:59:22 PM Koen Kooi wrote:
> Op 01-11-11 12:56, Andreas Müller schreef:
> > warnings fixed: WARNING: For recipe gnome-control-center, the following
> > files were installed but not shipped in any package: WARNING:
> > /usr/share/mime/XMLnamespaces WARNING:   /usr/share/mime/version WARNING:
> > /usr/share/mime/subclasses WARNING:   /usr/share/mime/globs2 WARNING:
> > /usr/share/mime/globs WARNING:   /usr/share/mime/types WARNING:
> > /usr/share/mime/mime.cache WARNING:   /usr/share/mime/icons WARNING:
> > /usr/share/mime/generic-icons WARNING:   /usr/share/mime/treemagic
> > WARNING:   /usr/share/mime/magic WARNING:   /usr/share/mime/aliases
> 
> THose aren't meant to be shipped, mime.bbclass should already package the
> stuff it needs.
How about adding a dummy package gnome-control-center-mime to clean up log and 
keep further enthusiastic patchers away?

Andreas
Andreas Müller - Nov. 1, 2011, 6:24 p.m.
On Tuesday, November 01, 2011 02:28:16 PM Koen Kooi wrote:
> Op 01-11-11 14:30, Andreas Müller schreef:
> > On Tuesday, November 01, 2011 12:59:22 PM Koen Kooi wrote:
> >> Op 01-11-11 12:56, Andreas Müller schreef:
> >>> warnings fixed: WARNING: For recipe gnome-control-center, the
> >>> following files were installed but not shipped in any package:
> >>> WARNING: /usr/share/mime/XMLnamespaces WARNING:
> >>> /usr/share/mime/version WARNING: /usr/share/mime/subclasses WARNING:
> >>> /usr/share/mime/globs2 WARNING: /usr/share/mime/globs WARNING:
> >>> /usr/share/mime/types WARNING: /usr/share/mime/mime.cache WARNING:
> >>> /usr/share/mime/icons WARNING: /usr/share/mime/generic-icons
> >>> WARNING: /usr/share/mime/treemagic WARNING:   /usr/share/mime/magic
> >>> WARNING: /usr/share/mime/aliases
> >> 
> >> THose aren't meant to be shipped, mime.bbclass should already package
> >> the stuff it needs.
> > 
> > How about adding a dummy package gnome-control-center-mime to clean up
> > log and keep further enthusiastic patchers away?
> 
> I'd suggest rm'ing them in do_install
> 
Sorry for making noise for this 'cosmetic' issue but I would like get a better 
understanding on this. 
mime.bbclass seems to pack all folders in /usr/share/mime, files will not be 
packed.

I looked a bit around and added

EXTRA_OECONF += "--disable-update-mimedb"

in the recipe. With this no files are installed but there is also 
/usr/share/mime/application/missing/x-gnome-theme-package.xml missing. Could 
this be a solution ( even for mime.bbclass )?

Andreas
Koen Kooi - Nov. 1, 2011, 6:43 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 01-11-11 19:24, Andreas Müller schreef:
> On Tuesday, November 01, 2011 02:28:16 PM Koen Kooi wrote:
>> Op 01-11-11 14:30, Andreas Müller schreef:
>>> On Tuesday, November 01, 2011 12:59:22 PM Koen Kooi wrote:
>>>> Op 01-11-11 12:56, Andreas Müller schreef:
>>>>> warnings fixed: WARNING: For recipe gnome-control-center, the 
>>>>> following files were installed but not shipped in any package: 
>>>>> WARNING: /usr/share/mime/XMLnamespaces WARNING: 
>>>>> /usr/share/mime/version WARNING: /usr/share/mime/subclasses
>>>>> WARNING: /usr/share/mime/globs2 WARNING: /usr/share/mime/globs
>>>>> WARNING: /usr/share/mime/types WARNING:
>>>>> /usr/share/mime/mime.cache WARNING: /usr/share/mime/icons
>>>>> WARNING: /usr/share/mime/generic-icons WARNING:
>>>>> /usr/share/mime/treemagic WARNING:   /usr/share/mime/magic 
>>>>> WARNING: /usr/share/mime/aliases
>>>> 
>>>> THose aren't meant to be shipped, mime.bbclass should already
>>>> package the stuff it needs.
>>> 
>>> How about adding a dummy package gnome-control-center-mime to clean
>>> up log and keep further enthusiastic patchers away?
>> 
>> I'd suggest rm'ing them in do_install
>> 
> Sorry for making noise for this 'cosmetic' issue but I would like get a
> better understanding on this.

The short version is that those are generated files of which only one copy
should exist. So if package them we get 2 problems:

1) clashes when installing packages
2) replacing properly generated mime files containing all the info with ones
only holding the info for a single package.

> mime.bbclass seems to pack all folders in /usr/share/mime, files will not
> be packed.
> 
> I looked a bit around and added
> 
> EXTRA_OECONF += "--disable-update-mimedb"
> 
> in the recipe. With this no files are installed but there is also 
> /usr/share/mime/application/missing/x-gnome-theme-package.xml missing.
> Could this be a solution ( even for mime.bbclass )?

It looks that way.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOsD3tMkyGM64RGpERAiCXAJ9FnaDhA9cLhYuJeZQLCq5ix6hPfACfbqOL
QY1lHZXym7qv7vy+//cvyBc=
=u477
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
index b308350..1ebfb6d 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -4,6 +4,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra"
 
+PR = "r1"
+
 inherit gnome
 
 SRC_URI[archive.md5sum] = "b4e8ab5c7556ae07addbfcfb4fa2f761"
@@ -20,6 +22,7 @@  FILES_${PN} += "${datadir}/icon* \
                 ${libdir}/window-manager-settings/*.so \
                 ${datadir}/gnome \
                 ${datadir}/desktop-directories \
+                ${datadir}/mime \
                "
 FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
 FILES_${PN}-dev += "${libdir}/window-manager-settings/*a"