[oe] [meta-gnome][PATCH] gnome-control-center: let mime.bbclass handle /usr/share/mime

Koen Kooi koen at dominion.thruhere.net
Fri May 2 13:14:23 UTC 2014


Delete generated files.

This fixes:

 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/version
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/mime.cache
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/treemagic
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/icons
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/generic-icons
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/types
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/aliases
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/subclasses
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/XMLnamespaces
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/magic
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/globs2
        But that file is already provided by package  * shared-mime-info
 * check_data_file_clashes: Package gnome-control-center wants to install file /build/v2014.06/build/tmp-angstrom_v2014_06-eglibc/work/beagleboard-angstrom-linux-gnueabi/development-gnome-image/1.0-r0/rootfs/usr/share/mime/globs
        But that file is already provided by package  * shared-mime-info

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
 .../gnome-control-center/gnome-control-center_2.32.1.bb            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 ee25c1e..aa24dc6 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
@@ -17,12 +17,17 @@ do_configure_prepend() {
     sed -i s:help::g Makefile.am
 }
 
+do_install_append() {
+    for generatedfile in XMLnamespaces aliases generic-icons globs globs2 icons magic mime.cache subclasses treemagic types version ; do
+        rm ${D}${datadir}/mime/$generatedfile
+    done
+}
+
 FILES_${PN} += "${datadir}/icon* \
                 ${datadir}/xsession* \
                 ${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/*.la"
-- 
1.9.0




More information about the Openembedded-devel mailing list