Patchwork [meta-gnome] gvfs: Handle samba dependency based on GPLv3 license.

login
register
mail settings
Submitter Noor Ahsan
Date June 17, 2013, 8:20 a.m.
Message ID <1371457230-6773-1-git-send-email-noor_ahsan@mentor.com>
Download mbox | patch
Permalink /patch/51801/
State Superseded
Headers show

Comments

Noor Ahsan - June 17, 2013, 8:20 a.m.
From: Noor <noor_ahsan@mentor.com>

* 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@mentor.com>
---
 meta-gnome/recipes-gnome/gvfs/gvfs.inc      |    4 +---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb |    7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
Paul Eggleton - June 17, 2013, 9:58 a.m.
On Monday 17 June 2013 13:20:30 Noor, Ahsan wrote:
> +PACKAGECONFIG = "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '',
> 'samba', d)}" +

This needs to use ?= or ??= so that it can be overridden easily.

Cheers,
Paul
Noor Ahsan - June 17, 2013, 11:11 a.m.
Thanks. I'll update it.

-----Original Message-----
From: Paul Eggleton [mailto:paul.eggleton@linux.intel.com] 
Sent: Monday, June 17, 2013 2:58 PM
To: Ahsan, Noor
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-gnome][PATCH] gvfs: Handle samba dependency based on GPLv3 license.

On Monday 17 June 2013 13:20:30 Noor, Ahsan wrote:
> +PACKAGECONFIG = "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '',
> 'samba', d)}" +

This needs to use ?= or ??= so that it can be overridden easily.

Cheers,
Paul

Patch

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
index 0e1c69c..ba52fe7 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
@@ -10,9 +10,7 @@  SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
 SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
 SRC_URI += "file://0001-gvfsfusedaemon.c-fix-glib-build.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.8.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.8.2.bb
index 7f86151..5274280 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 = "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}.1"
@@ -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"