Skip to contentSkip to conversation

samba: include auth_unix only with pam in PACKAGECONFIG

PATCH In review Martin Jansa 1 participant 4 messages Mar 18, 2016 – Mar 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 samba: include auth_unix only with pam in PACKAGECONFIG

* 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'
        )
---
 meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/samba/samba_4.1.12.bb +1 -1
index ff58dae..e9e2724 100644
@@ -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"
Signature · 1 line
2.7.3
#1 lore raw

PATCH 2/2 libftdi: Fix cpp-wrapper options

* 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

---
 meta-oe/recipes-support/libftdi/libftdi_1.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/libftdi/libftdi_1.2.bb +1 -1
index eb4d86c..1d15711 100644
@@ -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
 
Signature · 1 line
2.7.3
#2 lore raw

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

Quoted 24 lines · 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

---
 meta-oe/recipes-support/libftdi/libftdi_1.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/libftdi/libftdi_1.2.bb +0 -0
index eb4d86c..1d15711 100644

meta-oe/recipes-support/libftdi/libftdi_1.2.bb SRC_URI[sha256sum] = "a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b55 · line 23

Quoted 5 lines
meta-oe/recipes-support/libftdi/libftdi_1.2.bb +1 -1
@@ -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

Quoted 6 lines
meta-oe/recipes-support/libftdi/libftdi_1.2.bb +0 -0
 inherit cmake binconfig pkgconfig
 
Signature · 1 line
2.7.3
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
In reply to Martin Jansa
Quoted 7 lines · 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',

Quoted 5 lines
        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

Quoted 21 lines
---
 meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/samba/samba_4.1.12.bb +1 -1
index ff58dae..e9e2724 100644
@@ -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"
Signature · 1 line
2.7.3
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]