[oe] [meta-gnome][PATCH V2] gvfs: Handle samba dependency based on GPLv3 license.

[Martin Jansa]

On Wed, Jul 10, 2013 at 08:08:40AM +0000, Ahsan, Noor wrote:
> Do I need to send an updated patch?

No, I've already applied it manually in in-test branch (now it's waiting
for jenkins build).

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of Martin Jansa
> Sent: Tuesday, July 09, 2013 5:21 PM
> To: openembedded-devel at lists.openembedded.org
> Subject: Re: [oe] [meta-gnome][PATCH V2] gvfs: Handle samba dependency based on GPLv3 license.
> 
> On Tue, Jul 09, 2013 at 10:48:21AM +0000, Ahsan, Noor wrote:
> > Hello,
> > 
> > Kindly apply this patch. Thanks.
> > 
> > Noor
> 
> Somehow it got lost from my in-test queue, now it's back on track again, sorry.
> 
> Your patch was also based on very old meta-oe, we have 1.10.1 since
> 2013-05-03:
> http://git.openembedded.org/meta-openembedded/commit/?id=985fb27d51ecb948a195af5b27a3a3f6b5ab3f45
> 
> Please rebase before sending patches.
> 
> Regards,
> 
> > -----Original Message-----
> > From: Ahsan, Noor
> > Sent: Monday, June 17, 2013 4:12 PM
> > To: openembedded-devel at lists.openembedded.org
> > Cc: Ahsan, Noor
> > Subject: [meta-gnome][PATCH V2] gvfs: Handle samba dependency based on GPLv3 license.
> > 
> > From: Noor <noor_ahsan at 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 at 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(-)
> > 
> > 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"
> > --
> > 1.7.9.5
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130710/63b51ce8/attachment-0002.sig>