From 4a88a7ef10561f02c6a1bc9402c6b7cc76858dae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Sun, 23 Dec 2012 13:02:41 +0000 Subject: [PATCH] gvfs: reenable gvfs-smb MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. (From meta-openembedded rev: 496f9dc1eafb3a071d40f93f171318bfe3d1aafe) Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 6 ++++-- meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs.inc | 5 ++--- meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb index f52e338..3bc6b2b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb @@ -4,10 +4,12 @@ BPN = "gvfs" DEPENDS = "gvfs gnome-disk-utility" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" # we need gdu files only: reduce files to delete in libexecdir -EXTRA_OECONF += "--disable-gphoto2 --disable-afc" +EXTRA_OECONF += "--disable-gphoto2 \ + --disable-afc \ + --disable-samba" do_install_append() { rm -rf ${D}${sysconfdir} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs.inc index e86c93f..c69851c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs.inc +++ b/meta-openembedded/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-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb index 48373bc..7f86151 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb +++ b/meta-openembedded/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}.1" -- 2.7.4