diff options
author | Andreas Müller <schnitzeltony@gmx.de> | 2012-01-08 19:02:23 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-09 10:31:00 +0100 |
commit | 5b8522e3b592c96ec9325aff4bbaa68972e52d5b (patch) | |
tree | 4b4fb90a11c5fc3ecf3bd6f7ae8a649eaca26a48 /meta-gnome | |
parent | 6ae89951a73c97f6f1b4bbde39f3dadb72fa3dcd (diff) | |
download | meta-openembedded-5b8522e3b592c96ec9325aff4bbaa68972e52d5b.tar.gz |
gvfs: rework and add recipe for gvfs-gdu-volume-monitor
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>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 22 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs.inc | 19 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb | 22 |
3 files changed, 47 insertions, 16 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 new file mode 100644 index 000000000..c87b63e8f --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | require gvfs.inc | ||
2 | |||
3 | BPN = "gvfs" | ||
4 | |||
5 | DEPENDS = "gvfs gnome-disk-utility" | ||
6 | |||
7 | PR = "${INC_PR}.0" | ||
8 | |||
9 | # we need gdu files only: reduce files to delete in libexecdir | ||
10 | EXTRA_OECONF += "--disable-gphoto2" | ||
11 | |||
12 | do_install_append() { | ||
13 | rm -rf ${D}${sysconfdir} | ||
14 | rm -rf ${D}${bindir} | ||
15 | rm -rf ${D}${includedir} | ||
16 | rm -rf ${D}${libdir} | ||
17 | rm -rf ${D}${datadir}/gvfs/mounts | ||
18 | rm -f ${D}${datadir}/dbus-1/services/gvfs-* | ||
19 | rm -f ${D}${libexecdir}/gvfsd* | ||
20 | rm -f ${D}${libexecdir}/gvfs-fuse-daemon | ||
21 | rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor | ||
22 | } | ||
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc new file mode 100644 index 000000000..b6a0526f4 --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc | |||
@@ -0,0 +1,19 @@ | |||
1 | DESCRIPTION = "gvfs is a userspace virtual filesystem" | ||
2 | LICENSE = "LGPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
4 | |||
5 | inherit gnome | ||
6 | |||
7 | INC_PR = "r6" | ||
8 | |||
9 | SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562" | ||
10 | SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345" | ||
11 | |||
12 | EXTRA_OECONF = "--disable-samba \ | ||
13 | --with-samba-includes=${STAGING_INCDIR} \ | ||
14 | --with-samba-libs=${STAGING_LIBDIR} \ | ||
15 | --with-archive-includes=${STAGING_INCDIR} \ | ||
16 | " | ||
17 | |||
18 | FILES_${PN} += "${datadir}/dbus-1/services/*" | ||
19 | |||
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb index 5a230ebd7..297d6819c 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb | |||
@@ -1,27 +1,16 @@ | |||
1 | DESCRIPTION = "gvfs is a userspace virtual filesystem" | 1 | require gvfs.inc |
2 | LICENSE = "LGPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
4 | 2 | ||
5 | DEPENDS = "gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2" | 3 | DEPENDS = "gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2" |
6 | # optional: obexftp libcdio libimobiledevice | 4 | # optional: obexftp libcdio libimobiledevice |
7 | # building against gnome-disk-utility is also possible, but brings dependency loops :( | ||
8 | 5 | ||
9 | PR = "r6" | 6 | PR = "${INC_PR}.0" |
10 | 7 | ||
11 | inherit gnome | 8 | # in case of gnome-disk-utility was alresdy built: avoid double files |
12 | 9 | EXTRA_OECONF += "--disable-gdu" | |
13 | SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562" | ||
14 | SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345" | ||
15 | |||
16 | EXTRA_OECONF = "--disable-samba \ | ||
17 | --with-samba-includes=${STAGING_INCDIR} \ | ||
18 | --with-samba-libs=${STAGING_LIBDIR} \ | ||
19 | --with-archive-includes=${STAGING_INCDIR} \ | ||
20 | " | ||
21 | 10 | ||
22 | PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" | 11 | PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" |
23 | 12 | ||
24 | FILES_${PN} += "${datadir}/dbus-1/services/* ${datadir}/GConf ${datadir}/glib-2.0 ${libdir}/gio/modules/*.so" | 13 | FILES_${PN} += "${datadir}/glib-2.0 ${datadir}/GConf ${libdir}/gio/modules/*.so" |
25 | FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" | 14 | FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" |
26 | FILES_${PN}-dev += "${libdir}/gio/modules/*.la" | 15 | FILES_${PN}-dev += "${libdir}/gio/modules/*.la" |
27 | 16 | ||
@@ -29,4 +18,5 @@ FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" | |||
29 | FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" | 18 | FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" |
30 | FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" | 19 | FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" |
31 | 20 | ||
21 | RDEPENDS_${PN} = "gvfs-gdu-volume-monitor" | ||
32 | RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" | 22 | RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" |