From c8ee819e346a4b11ce59485b39599444cbb3bee6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 15 Nov 2015 16:20:38 +0100 Subject: samba: add dependency on libbsd cyrus-sasl and PACKAGECONFIG for dmapi * dmapi is in meta-filesystems * hopefully fixes: WARN: samba: samba rdepends on cyrus-sasl, but it isn't a build dependency? WARN: samba: samba rdepends on dmapi, but it isn't a build dependency? WARN: samba: samba rdepends on libbsd, but it isn't a build dependency? WARN: samba: samba rdepends on libpam, but it isn't a build dependency? WARN: samba: samba-python rdepends on libbsd, but it isn't a build dependency? Signed-off-by: Martin Jansa --- meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 04df8a3ce8..cb29ab9d95 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb @@ -40,7 +40,8 @@ SRC_URI[sha256sum] = "033604674936bf5c77d7df299b0626052b84a41505a6a6afe902f6274f inherit systemd waf-samba cpan-base perlnative -DEPENDS += "readline virtual/libiconv zlib popt talloc libtdb libtevent libldb krb5 ctdb" +DEPENDS += "readline virtual/libiconv zlib popt talloc libtdb libtevent libldb krb5 ctdb libbsd cyrus-sasl" + SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" @@ -57,11 +58,12 @@ RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}" PACKAGECONFIG[acl] = "--with-acl-support,---without-acl-support,acl" PACKAGECONFIG[aio] = "--with-aio-support,---without-aio-support,libaio" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" +PACKAGECONFIG[pam] = "--with-pam --with-pam_smbpass --with-pammodulesdir=${base_libdir}/security,--without-pam --without-pam_smbpass,libpam" PACKAGECONFIG[lsb] = ",,lsb" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" @@ -77,7 +79,6 @@ EXTRA_OECONF += "--enable-fhs \ --with-piddir=${localstatedir}/run \ --with-sockets-dir=${localstatedir}/run/samba \ --with-modulesdir=${libdir}/samba \ - --with-pammodulesdir=${base_libdir}/security \ --with-lockdir=${localstatedir}/lib/samba \ --with-cachedir=${localstatedir}/lib/samba \ --with-perl-lib-install-dir=${PERL_VERNDORLIB} \ -- cgit 1.2.3-korg