[PATCH][meta-oe 1/2] samba: include auth_unix only with pam in PACKAGECONFIG

[PATCH][meta-oe 1/2] samba: include auth_unix only with pam in PACKAGECONFIG

[Martin Jansa]

* fixes:
  WARN: samba: samba rdepends on libpam, but it isn't a build dependency?
  reported by test-dependencies
* log.do_package shows:
  DEBUG: samba: Dependency libpam.so.0 requires package libpam (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/samba/4.1.12-r0/packages-split/samba/usr/lib/samba/libauth4.so)
* source4/auth/ntlm/wscript_build shows pam dependency:
  bld.SAMBA_MODULE('auth4_unix',
        source='auth_unix.c',
        subsystem='auth4',
        init_function='auth4_unix_init',
        deps='pam PAM_ERRORS LIBTSOCKET'
        )

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
index ff58dae..e9e2724 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
@@ -82,7 +82,7 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'sasl', '', 'file://21-avoid-s
 
 SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
 SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
-SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
+SAMBA4_AUTH_MODULES="${@bb.utils.contains('PACKAGECONFIG', 'pam', 'auth_unix,', '', d)}auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
 SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}"
 
 SAMBA4_LIBS="heimdal,!zlib,!popt,!talloc,!pytalloc,!pytalloc-util,!tevent,!pytevent,!tdb,!pytdb,!ldb,!pyldb"
-- 
2.7.3

[PATCH][meta-oe 2/2] libftdi: Fix cpp-wrapper options

[Martin Jansa]

* fixes following issue found with test-dependencies
  WARN: libftdi: libftdi rdepends on libgcc, but it isn't a build dependency?
  WARN: libftdi: libftdi rdepends on libstdc++, but it isn't a build dependency?
* when boost is found it was still building libftdipp1.so.2.2.0
* as shown in log.do_package:
  DEBUG: calculating shlib requirements for libftdi
  DEBUG: libftdi: Dependency libftdi1.so.2 requires package libftdi (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
  DEBUG: libftdi: Dependency libusb-1.0.so.0 requires package libusb1 (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
  DEBUG: libftdi: Dependency libstdc++.so.6 requires package libstdc++ (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
  DEBUG: libftdi: Dependency libgcc_s.so.1 requires package libgcc (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
  DEBUG: libftdi: Dependency libusb-1.0.so.0 requires package libusb1 (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdi1.so.2.2.0)
  DEBUG: libftdi: Dependency libc.so.6 requires package glibc (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdi1.so.2.2.0)
  DEBUG: Python function package_do_shlibs finished

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/libftdi/libftdi_1.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.2.bb b/meta-oe/recipes-support/libftdi/libftdi_1.2.bb
index eb4d86c..1d15711 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_1.2.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_1.2.bb
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b55
 S = "${WORKDIR}/${BPN}1-${PV}"
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on,-DFTDI_BUILD_CPP=off,boost"
+PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=ooff,boost"
 
 inherit cmake binconfig pkgconfig
 
-- 
2.7.3

Re: [PATCH][meta-oe 2/2] libftdi: Fix cpp-wrapper options

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2760 bytes --]

On Fri, Mar 18, 2016 at 05:30:48PM +0100, Martin Jansa wrote:
> * fixes following issue found with test-dependencies
>   WARN: libftdi: libftdi rdepends on libgcc, but it isn't a build dependency?
>   WARN: libftdi: libftdi rdepends on libstdc++, but it isn't a build dependency?
> * when boost is found it was still building libftdipp1.so.2.2.0
> * as shown in log.do_package:
>   DEBUG: calculating shlib requirements for libftdi
>   DEBUG: libftdi: Dependency libftdi1.so.2 requires package libftdi (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
>   DEBUG: libftdi: Dependency libusb-1.0.so.0 requires package libusb1 (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
>   DEBUG: libftdi: Dependency libstdc++.so.6 requires package libstdc++ (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
>   DEBUG: libftdi: Dependency libgcc_s.so.1 requires package libgcc (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdipp1.so.2.2.0)
>   DEBUG: libftdi: Dependency libusb-1.0.so.0 requires package libusb1 (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdi1.so.2.2.0)
>   DEBUG: libftdi: Dependency libc.so.6 requires package glibc (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/libftdi/1.2-r0/packages-split/libftdi/usr/lib/libftdi1.so.2.2.0)
>   DEBUG: Python function package_do_shlibs finished
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/libftdi/libftdi_1.2.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.2.bb b/meta-oe/recipes-support/libftdi/libftdi_1.2.bb
> index eb4d86c..1d15711 100644
> --- a/meta-oe/recipes-support/libftdi/libftdi_1.2.bb
> +++ b/meta-oe/recipes-support/libftdi/libftdi_1.2.bb
> @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b55
>  S = "${WORKDIR}/${BPN}1-${PV}"
>  
>  PACKAGECONFIG ??= ""
> -PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on,-DFTDI_BUILD_CPP=off,boost"
> +PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=ooff,boost"

s/ooff/off/g

already done in master-next branch

>  
>  inherit cmake binconfig pkgconfig
>  
> -- 
> 2.7.3
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH][meta-oe 1/2] samba: include auth_unix only with pam in PACKAGECONFIG

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2497 bytes --]

On Fri, Mar 18, 2016 at 05:30:47PM +0100, Martin Jansa wrote:
> * fixes:
>   WARN: samba: samba rdepends on libpam, but it isn't a build dependency?
>   reported by test-dependencies
> * log.do_package shows:
>   DEBUG: samba: Dependency libpam.so.0 requires package libpam (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/samba/4.1.12-r0/packages-split/samba/usr/lib/samba/libauth4.so)
> * source4/auth/ntlm/wscript_build shows pam dependency:
>   bld.SAMBA_MODULE('auth4_unix',
>         source='auth_unix.c',
>         subsystem='auth4',
>         init_function='auth4_unix_init',
>         deps='pam PAM_ERRORS LIBTSOCKET'
>         )

This still isn't enough to get rid of pam autodependency. I've tried to
patch wscript files a bit to respect pam everywhere, but now it fails to
build, I'm willing to give-up on this one, I don't even use samba
anywhere FFS, I should do something more interesting with my limited
time.

http://git.openembedded.org/meta-openembedded-contrib/commit/?h=jansa/master-next-unresolved-review&id=b838ec649c8f88e40ac7799bb19421c6f02a54ec

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
> index ff58dae..e9e2724 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
> @@ -82,7 +82,7 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'sasl', '', 'file://21-avoid-s
>  
>  SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
>  SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
> -SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
> +SAMBA4_AUTH_MODULES="${@bb.utils.contains('PACKAGECONFIG', 'pam', 'auth_unix,', '', d)}auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
>  SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}"
>  
>  SAMBA4_LIBS="heimdal,!zlib,!popt,!talloc,!pytalloc,!pytalloc-util,!tevent,!pytevent,!tdb,!pytdb,!ldb,!pyldb"
> -- 
> 2.7.3
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]