Patchwork [meta-oe] Fix samba's DEPENDS which was triggering rebuild

login
register
mail settings
Submitter Jate S
Date April 7, 2014, 3:47 p.m.
Message ID <1396885622-28017-1-git-send-email-jatedev@gmail.com>
Download mbox | patch
Permalink /patch/70217/
State Accepted, archived
Headers show

Comments

Jate S - April 7, 2014, 3:47 p.m.
From: Jate Sujjavanich <jate.sujjavanich@myfuelmaster.com>

Use PACKAGECONFIG to properly provide the option for libtalloc

Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
---
 meta-oe/recipes-connectivity/samba/samba.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - April 20, 2014, 11:18 a.m.
On Mon, Apr 07, 2014 at 11:47:02AM -0400, Jate Sujjavanich wrote:
> From: Jate Sujjavanich <jate.sujjavanich@myfuelmaster.com>
> 
> Use PACKAGECONFIG to properly provide the option for libtalloc

Merged, thanks!

> 
> Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
> ---
>  meta-oe/recipes-connectivity/samba/samba.inc |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
> index 7391bbf..b527a66 100644
> --- a/meta-oe/recipes-connectivity/samba/samba.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba.inc
> @@ -1,6 +1,6 @@
>  SECTION = "console/network"
>  LICENSE = "GPL-3.0"
> -DEPENDS = "readline virtual/libiconv talloc zlib popt"
> +DEPENDS = "readline virtual/libiconv zlib popt"
>  
>  SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
>             file://volatiles.03_samba \
> @@ -35,7 +35,6 @@ EXTRA_OECONF='--disable-cups \
>                --with-aio-support \
>                --with-winbind \
>                --with-wbclient \
> -              --without-libtalloc \
>                --without-acl-support \
>                --disable-avahi \
>                samba_cv_struct_timespec=yes \
> @@ -44,6 +43,7 @@ EXTRA_OECONF='--disable-cups \
>  PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
>  PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
>  PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
> +PACKAGECONFIG[talloc] = "--with-libtalloc,--without-libtalloc,talloc"
>  
>  INITSCRIPT_PACKAGES = "samba winbind"
>  INITSCRIPT_NAME_samba = "samba"
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index 7391bbf..b527a66 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -1,6 +1,6 @@ 
 SECTION = "console/network"
 LICENSE = "GPL-3.0"
-DEPENDS = "readline virtual/libiconv talloc zlib popt"
+DEPENDS = "readline virtual/libiconv zlib popt"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
            file://volatiles.03_samba \
@@ -35,7 +35,6 @@  EXTRA_OECONF='--disable-cups \
               --with-aio-support \
               --with-winbind \
               --with-wbclient \
-              --without-libtalloc \
               --without-acl-support \
               --disable-avahi \
               samba_cv_struct_timespec=yes \
@@ -44,6 +43,7 @@  EXTRA_OECONF='--disable-cups \
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
 PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
+PACKAGECONFIG[talloc] = "--with-libtalloc,--without-libtalloc,talloc"
 
 INITSCRIPT_PACKAGES = "samba winbind"
 INITSCRIPT_NAME_samba = "samba"