summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-04-09 13:17:41 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-04-09 13:46:22 +0200
commit839eeb13b83c2dda89901a2fe1b7f726d5b20b6b (patch)
tree6bbc860ceb997394f86d7dfe81cf4bd51df81f52
parent5fced1d76e2771be2a90495fd26362f8645411b2 (diff)
downloadmeta-openembedded-839eeb13b83c2dda89901a2fe1b7f726d5b20b6b.tar.gz
gvfs-gdu-volume-monitor 1.8.2: remove conflicting files
* check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml But that file is already provided by package * gvfs * check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml But that file is already provided by package * gvfs * check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/GConf/gsettings/gvfs-dns-sd.convert But that file is already provided by package * gvfs Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb4
1 files changed, 3 insertions, 1 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 c87b63e8f..689f45586 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"
4 4
5DEPENDS = "gvfs gnome-disk-utility" 5DEPENDS = "gvfs gnome-disk-utility"
6 6
7PR = "${INC_PR}.0" 7PR = "${INC_PR}.1"
8 8
9# we need gdu files only: reduce files to delete in libexecdir 9# we need gdu files only: reduce files to delete in libexecdir
10EXTRA_OECONF += "--disable-gphoto2" 10EXTRA_OECONF += "--disable-gphoto2"
@@ -15,6 +15,8 @@ do_install_append() {
15 rm -rf ${D}${includedir} 15 rm -rf ${D}${includedir}
16 rm -rf ${D}${libdir} 16 rm -rf ${D}${libdir}
17 rm -rf ${D}${datadir}/gvfs/mounts 17 rm -rf ${D}${datadir}/gvfs/mounts
18 rm -rf ${D}${datadir}/glib-2.0
19 rm -rf ${D}${datadir}/GConf
18 rm -f ${D}${datadir}/dbus-1/services/gvfs-* 20 rm -f ${D}${datadir}/dbus-1/services/gvfs-*
19 rm -f ${D}${libexecdir}/gvfsd* 21 rm -f ${D}${libexecdir}/gvfsd*
20 rm -f ${D}${libexecdir}/gvfs-fuse-daemon 22 rm -f ${D}${libexecdir}/gvfs-fuse-daemon