diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-11-15 16:20:38 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-11-16 21:50:11 +0100 |
commit | c8ee819e346a4b11ce59485b39599444cbb3bee6 (patch) | |
tree | 91f5069993a893291cdbc7d5aadfb9dc953086ed /meta-networking | |
parent | 0e525daafe2958504674a9910bbed7c1b4d3fd38 (diff) | |
download | meta-openembedded-c8ee819e346a4b11ce59485b39599444cbb3bee6.tar.gz |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 7 |
1 files 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 04df8a3ce..cb29ab9d9 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 | |||
40 | 40 | ||
41 | inherit systemd waf-samba cpan-base perlnative | 41 | inherit systemd waf-samba cpan-base perlnative |
42 | 42 | ||
43 | DEPENDS += "readline virtual/libiconv zlib popt talloc libtdb libtevent libldb krb5 ctdb" | 43 | DEPENDS += "readline virtual/libiconv zlib popt talloc libtdb libtevent libldb krb5 ctdb libbsd cyrus-sasl" |
44 | |||
44 | 45 | ||
45 | SYSVINITTYPE_linuxstdbase = "lsb" | 46 | SYSVINITTYPE_linuxstdbase = "lsb" |
46 | SYSVINITTYPE = "sysv" | 47 | SYSVINITTYPE = "sysv" |
@@ -57,11 +58,12 @@ RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}" | |||
57 | PACKAGECONFIG[acl] = "--with-acl-support,---without-acl-support,acl" | 58 | PACKAGECONFIG[acl] = "--with-acl-support,---without-acl-support,acl" |
58 | PACKAGECONFIG[aio] = "--with-aio-support,---without-aio-support,libaio" | 59 | PACKAGECONFIG[aio] = "--with-aio-support,---without-aio-support,libaio" |
59 | PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" | 60 | PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" |
60 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" | 61 | PACKAGECONFIG[pam] = "--with-pam --with-pam_smbpass --with-pammodulesdir=${base_libdir}/security,--without-pam --without-pam_smbpass,libpam" |
61 | PACKAGECONFIG[lsb] = ",,lsb" | 62 | PACKAGECONFIG[lsb] = ",,lsb" |
62 | PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" | 63 | PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" |
63 | PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" | 64 | PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" |
64 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" | 65 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" |
66 | PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" | ||
65 | PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" | 67 | PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" |
66 | 68 | ||
67 | SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" | 69 | SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" |
@@ -77,7 +79,6 @@ EXTRA_OECONF += "--enable-fhs \ | |||
77 | --with-piddir=${localstatedir}/run \ | 79 | --with-piddir=${localstatedir}/run \ |
78 | --with-sockets-dir=${localstatedir}/run/samba \ | 80 | --with-sockets-dir=${localstatedir}/run/samba \ |
79 | --with-modulesdir=${libdir}/samba \ | 81 | --with-modulesdir=${libdir}/samba \ |
80 | --with-pammodulesdir=${base_libdir}/security \ | ||
81 | --with-lockdir=${localstatedir}/lib/samba \ | 82 | --with-lockdir=${localstatedir}/lib/samba \ |
82 | --with-cachedir=${localstatedir}/lib/samba \ | 83 | --with-cachedir=${localstatedir}/lib/samba \ |
83 | --with-perl-lib-install-dir=${PERL_VERNDORLIB} \ | 84 | --with-perl-lib-install-dir=${PERL_VERNDORLIB} \ |