CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

gvfs: rework and add recipe for gvfs-gdu-volume-monitor

Browse Source 
To make gvfs work with removable devices/volumes, gvfs-gdu-volume-monitor
( gdu = gnome-disk-utility ) is required. During a build from scratch
gvfs-configure disables gdu because it can not find gnome-disk-utility.
It can not be added to gvfs DEPENDS because this causes circular dependencies:

nautilus DEPENDS gvfs
gvfs DEPENDS gnome-disk-utility
gnome-disk-utility DEPENDS nautilus

The solution is a new recipe for gvfs-gdu-volume-monitor. To reduce maintenance
efforts and to ensure that gvfs-gdu-volume-monitor is build under same
conditions as gvfs, as much settings as possible were moved to gvfs.inc. INC_PR
is started at 6 to ensure rebuilding.

run-tested for incremental build and build from scratch.

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller 2012-01-08 19:02:23 +00:00 committed by Koen Kooi
parent 6ae89951a7
commit 5b8522e3b5
3 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb Normal file
View File

@ -0,0 +1,22 @@
require gvfs.inc
BPN = "gvfs"
DEPENDS = "gvfs gnome-disk-utility"
PR = "${INC_PR}.0"
# we need gdu files only: reduce files to delete in libexecdir
EXTRA_OECONF += "--disable-gphoto2"
do_install_append() {
rm -rf ${D}${sysconfdir}
rm -rf ${D}${bindir}
rm -rf ${D}${includedir}
rm -rf ${D}${libdir}
rm -rf ${D}${datadir}/gvfs/mounts
rm -f ${D}${datadir}/dbus-1/services/gvfs-*
rm -f ${D}${libexecdir}/gvfsd*
rm -f ${D}${libexecdir}/gvfs-fuse-daemon
rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor
}

19
meta-gnome/recipes-gnome/gvfs/gvfs.inc Normal file
View File

@ -0,0 +1,19 @@
DESCRIPTION = "gvfs is a userspace virtual filesystem"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
inherit gnome
INC_PR = "r6"
SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
EXTRA_OECONF = "--disable-samba \
--with-samba-includes=${STAGING_INCDIR} \
--with-samba-libs=${STAGING_LIBDIR} \
--with-archive-includes=${STAGING_INCDIR} \
"
FILES_${PN} += "${datadir}/dbus-1/services/*"

22
meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb
View File

@ -1,27 +1,16 @@
DESCRIPTION = "gvfs is a userspace virtual filesystem"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
require gvfs.inc
DEPENDS = "gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2"
# optional: obexftp libcdio libimobiledevice
# building against gnome-disk-utility is also possible, but brings dependency loops :(
PR = "r6"
PR = "${INC_PR}.0"
inherit gnome
SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
EXTRA_OECONF = "--disable-samba \
--with-samba-includes=${STAGING_INCDIR} \
--with-samba-libs=${STAGING_LIBDIR} \
--with-archive-includes=${STAGING_INCDIR} \
"
# in case of gnome-disk-utility was alresdy built: avoid double files
EXTRA_OECONF += "--disable-gdu"
PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
FILES_${PN} += "${datadir}/dbus-1/services/* ${datadir}/GConf ${datadir}/glib-2.0 ${libdir}/gio/modules/*.so"
FILES_${PN} += "${datadir}/glib-2.0 ${datadir}/GConf ${libdir}/gio/modules/*.so"
FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
@ -29,4 +18,5 @@ FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount"
FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount"
FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount"
RDEPENDS_${PN} = "gvfs-gdu-volume-monitor"
RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh"