Patchwork [meta-gnome] gvfs-gdu-volume-monitor: fix build after oe-core's libexecdir transition

login
register
mail settings
Submitter Andreas Müller
Date Oct. 25, 2012, 1:13 p.m.
Message ID <1351170785-9914-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/38567/
State Accepted
Commit e01b143e69ef4ea2f2a49bc40a4034a066e2035d
Headers show

Comments

Andreas Müller - Oct. 25, 2012, 1:13 p.m.
tests:
* buildhistory check with libexecdir = /usr/libexec
* run test with libexecdir = /usr/lib/${BPN}

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb          |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

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 689f455..fe5af46 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"
 
 DEPENDS = "gvfs gnome-disk-utility"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 # we need gdu files only: reduce files to delete in libexecdir
 EXTRA_OECONF += "--disable-gphoto2"
@@ -13,7 +13,9 @@  do_install_append() {
 	rm -rf ${D}${sysconfdir}
 	rm -rf ${D}${bindir}
 	rm -rf ${D}${includedir}
-	rm -rf ${D}${libdir}
+	rm -rf ${D}${libdir}/gio
+	rm -rf ${D}${libdir}/lib*
+	rmdir --ignore-fail-on-non-empty ${D}${libdir}
 	rm -rf ${D}${datadir}/gvfs/mounts
 	rm -rf ${D}${datadir}/glib-2.0
 	rm -rf ${D}${datadir}/GConf