diff options
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs.inc | 4 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc index 4914285852..288b205da4 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc +++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc @@ -17,9 +17,7 @@ SRC_URI += " \ file://0004-Adapt-to-glib-thread-API-changes.patch \ " -EXTRA_OECONF = "--with-samba-includes=${STAGING_INCDIR} \ - --with-samba-libs=${STAGING_LIBDIR} \ - --with-archive-includes=${STAGING_INCDIR} \ +EXTRA_OECONF = "--with-archive-includes=${STAGING_INCDIR} \ --with-archive-libs=${STAGING_LIBDIR} \ " diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb index 9c21760b76..cab0d348e6 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb @@ -1,6 +1,6 @@ require gvfs.inc -DEPENDS = "samba libsoup-2.4 gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2" +DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2" # optional: obexftp libcdio libimobiledevice PR = "${INC_PR}.0" @@ -21,3 +21,8 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun RDEPENDS_${PN} = "gvfs-gdu-volume-monitor" RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" + +PACKAGECONFIG ?= "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba', d)}" + +PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \ + --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba" |