aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-04-23 14:35:40 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-05-03 20:45:03 +0200
commit09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9 (patch)
treef58d85c2845022bd37dcdd6e474318ba861b3910 /meta-gnome
parentee70937a49afc9031401b369f037dbc8fc7e919d (diff)
downloadmeta-openembedded-contrib-09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9.tar.gz
meta-openembedded-contrib-09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9.tar.bz2
meta-openembedded-contrib-09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9.zip
gnome-control-center: Unbreak gnome images
images that now include both shared-mime-info and gnome-control-center We get Collected errors: * check_data_file_clashes: Package gnome-control-center wants to * install file * /home/kraj/work/angstrom-repo/build/tmp-angstrom_next-eglibc/work/beaglebone-angstrom-linux-gnueabi/systemd-gnome-image/1.0-r0/rootfs/usr/share/mime/generic-icons But that file is already provided by package * shared-mime-info This brings it back to wheree it was additionally removes the packaging warnings Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb4
1 files changed, 3 insertions, 1 deletions
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 ee25c1ec0a..05e59cd8ad 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
@@ -16,13 +16,15 @@ LDFLAGS += "-lgthread-2.0 -lxml2"
do_configure_prepend() {
sed -i s:help::g Makefile.am
}
+do_install_append() {
+ rm -rf ${D}${datadir}/mime
+}
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"