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

Martin Jansa martin.jansa at gmail.com
Fri Mar 18 16:30:47 UTC 2016


* 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 at 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




More information about the Openembedded-devel mailing list