mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
gvfs: reenable gvfs-smb
samba was disabled in 12cf4fa8d2 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>
This commit is contained in:
committed by
Martin Jansa
parent
18e56610d4
commit
496f9dc1ea
@@ -4,10 +4,12 @@ BPN = "gvfs"
|
|||||||
|
|
||||||
DEPENDS = "gvfs gnome-disk-utility"
|
DEPENDS = "gvfs gnome-disk-utility"
|
||||||
|
|
||||||
PR = "${INC_PR}.4"
|
PR = "${INC_PR}.5"
|
||||||
|
|
||||||
# we need gdu files only: reduce files to delete in libexecdir
|
# 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() {
|
do_install_append() {
|
||||||
rm -rf ${D}${sysconfdir}
|
rm -rf ${D}${sysconfdir}
|
||||||
|
|||||||
@@ -4,14 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
|
|||||||
|
|
||||||
inherit gnome
|
inherit gnome
|
||||||
|
|
||||||
INC_PR = "r8"
|
INC_PR = "r9"
|
||||||
|
|
||||||
SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
|
SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
|
||||||
SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
|
SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
|
||||||
SRC_URI += "file://0001-gvfsfusedaemon.c-fix-glib-build.patch"
|
SRC_URI += "file://0001-gvfsfusedaemon.c-fix-glib-build.patch"
|
||||||
|
|
||||||
EXTRA_OECONF = "--disable-samba \
|
EXTRA_OECONF = "--with-samba-includes=${STAGING_INCDIR} \
|
||||||
--with-samba-includes=${STAGING_INCDIR} \
|
|
||||||
--with-samba-libs=${STAGING_LIBDIR} \
|
--with-samba-libs=${STAGING_LIBDIR} \
|
||||||
--with-archive-includes=${STAGING_INCDIR} \
|
--with-archive-includes=${STAGING_INCDIR} \
|
||||||
--with-archive-libs=${STAGING_LIBDIR} \
|
--with-archive-libs=${STAGING_LIBDIR} \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require gvfs.inc
|
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
|
# optional: obexftp libcdio libimobiledevice
|
||||||
|
|
||||||
PR = "${INC_PR}.1"
|
PR = "${INC_PR}.1"
|
||||||
|
|||||||
Reference in New Issue
Block a user