diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-12-23 13:02:41 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-27 16:14:22 +0100 |
| commit | 496f9dc1eafb3a071d40f93f171318bfe3d1aafe (patch) | |
| tree | 80e9d46728372b7cc008f890d4d61408b6e4fb54 /meta-gnome | |
| parent | 18e56610d439e90327211ada33ee90241b39d387 (diff) | |
| download | meta-openembedded-contrib-496f9dc1eafb3a071d40f93f171318bfe3d1aafe.tar.gz | |
gvfs: reenable gvfs-smb
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@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 6 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs.inc | 5 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb | 2 |
3 files changed, 7 insertions, 6 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 f52e3382d3..3bc6b2bd38 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,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-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc index e86c93fa93..c69851c0f2 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 48373bc3bb..7f8615106e 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}.1" |