[oe] [meta-xfce/meta-gnome 12/12] gvfs: reenable gvfs-smb
Andreas Müller
schnitzeltony at googlemail.com
Sun Dec 23 13:02:41 UTC 2012
samba was disabled in 12cf4fa8d23badbf55a018db0f821909294de34e because it
caused OOM condition. This could not be reproduced any more. Likely reason for
OOM wasmissing gdu-volume-monitor which is build by an own recipe nowadays.
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
.../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 3 ++-
meta-gnome/recipes-gnome/gvfs/gvfs.inc | 5 ++---
meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb | 2 +-
3 files changed, 5 insertions(+), 5 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 1939f09..f2f354c 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
@@ -7,7 +7,8 @@ DEPENDS = "gvfs gnome-disk-utility"
PR = "${INC_PR}.3"
# we need gdu files only: reduce files to delete in libexecdir
-EXTRA_OECONF += "--disable-gphoto2"
+EXTRA_OECONF += "--disable-samba \
+ --disable-gphoto2"
do_install_append() {
rm -rf ${D}${sysconfdir}
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
index e86c93f..c69851c 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
@@ -4,14 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
inherit gnome
-INC_PR = "r8"
+INC_PR = "r9"
SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
SRC_URI += "file://0001-gvfsfusedaemon.c-fix-glib-build.patch"
-EXTRA_OECONF = "--disable-samba \
- --with-samba-includes=${STAGING_INCDIR} \
+EXTRA_OECONF = "--with-samba-includes=${STAGING_INCDIR} \
--with-samba-libs=${STAGING_LIBDIR} \
--with-archive-includes=${STAGING_INCDIR} \
--with-archive-libs=${STAGING_LIBDIR} \
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 1ee6d6d..85ffd4a 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb
@@ -1,6 +1,6 @@
require gvfs.inc
-DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2"
+DEPENDS = "samba libsoup-2.4 gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2"
# optional: obexftp libcdio libimobiledevice
PR = "${INC_PR}.0"
--
1.7.4.4
More information about the Openembedded-devel
mailing list