aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2018-03-21 14:30:14 +0100
committerAndreas Oberritter <obi@opendreambox.org>2018-12-20 22:29:58 +0100
commit3afd3d569a26161428194c5dc0a8b0f76f25c44a (patch)
tree014a5dbba4947ae6072e64adccc93aee1eeb0676
parent714d89dcd90f9b01583d111c4bebec746a5b49f7 (diff)
downloadmeta-openembedded-contrib-3afd3d569a26161428194c5dc0a8b0f76f25c44a.tar.gz
meta-openembedded-contrib-3afd3d569a26161428194c5dc0a8b0f76f25c44a.tar.bz2
meta-openembedded-contrib-3afd3d569a26161428194c5dc0a8b0f76f25c44a.zip
samba: Allow build without PAM
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.7.6.bb11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb
index a9cd876ebf..e7abcea3c3 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb
@@ -24,9 +24,9 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
file://dnsserver-4.7.0.patch \
file://smb_conf-4.7.0.patch \
file://volatiles.03_samba \
+ file://samba-pam.patch \
"
SRC_URI_append_libc-musl = " \
- file://samba-pam.patch \
file://samba-4.3.9-remove-getpwent_r.patch \
"
@@ -37,10 +37,7 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d
# remove default added RDEPENDS on perl
RDEPENDS_${PN}_remove = "perl"
-DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam"
-
-inherit distro_features_check
-REQUIRED_DISTRO_FEATURES = "pam"
+DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio"
DEPENDS_append_libc-musl = " libtirpc"
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
@@ -64,7 +61,7 @@ SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable"
# Use krb5. Build active domain controller.
#
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd zeroconf', d)} \
acl ad-dc cups gnutls ldap mitkrb5 \
"
@@ -82,6 +79,7 @@ PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi"
PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind,"
PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust"
PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive"
+PACKAGECONFIG[pam] = "--with-pam --with-pammodulesdir=${base_libdir}/security,--without-pam,libpam"
# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS,
# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to:
@@ -121,7 +119,6 @@ EXTRA_OECONF += "--enable-fhs \
--with-cluster-support \
--with-profiling-data \
--with-libiconv=${STAGING_DIR_HOST}${prefix} \
- --with-pam --with-pammodulesdir=${base_libdir}/security \
"
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"