diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2016-09-17 12:04:42 +0200 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-10-20 10:25:49 -0400 |
| commit | a95726df4bb1c898da7e4d4dbf9e2846914061e4 (patch) | |
| tree | 699cb947435fb868862a6c357712a5418652ebbd /meta-networking | |
| parent | 3fdfdd8ff4f2cb8c70dd08d5c0cf363384259563 (diff) | |
| download | meta-openembedded-contrib-a95726df4bb1c898da7e4d4dbf9e2846914061e4.tar.gz | |
samba: replace pam packageconfig by hard dependency
samba links against libpam even if pam is not in packageconfig and libpam was
built before. This patch avoid this floating dependency - other solution could
not be found. For those who want packageconfig back, see discussion iat [1] for
further inspiration.
[1] http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109143.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index 3686faaeee..e9694d4e9c 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -28,7 +28,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 krb5 libbsd libaio" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 libbsd libaio libpam" SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" @@ -36,8 +36,7 @@ SYSVINITTYPE = "sysv" INITSCRIPT_NAME = "samba.sh" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ @@ -48,7 +47,6 @@ RDEPENDS_${PN}-ctdb-tests += "bash" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[pam] = "--with-pam --with-pammodulesdir=${base_libdir}/security,--without-pam,libpam" PACKAGECONFIG[lsb] = ",,lsb" PACKAGECONFIG[sysv] = ",,sysvinit" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" @@ -85,6 +83,7 @@ EXTRA_OECONF += "--enable-fhs \ --with-cluster-support \ --with-profiling-data \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ " DISABLE_STATIC = "" |