[oe-commits] Noor : gvfs: Handle samba dependency based on GPLv3 license.
git at git.openembedded.org
git at git.openembedded.org
Fri Jul 12 09:57:24 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: 54145480b0108b4f3e9f68f1b5572b9927076458
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=54145480b0108b4f3e9f68f1b5572b9927076458
Author: Noor <noor_ahsan at mentor.com>
Date: Mon Jun 17 11:11:42 2013 +0000
gvfs: Handle samba dependency based on GPLv3 license.
* Samba is GPLv3. In GPLv3 free environment one was not able to
build gvfs. Add PACKAGECONFIG for samba and enable is when GPLv3
is not present in INCOMPATIBLE_LICENSE.
Signed-off-by: Noor Ahsan <noor_ahsan at mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-gnome/recipes-gnome/gvfs/gvfs.inc | 4 +---
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 4914285..288b205 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 9c21760..cab0d34 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"
More information about the Openembedded-commits
mailing list