mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-12 17:20:13 +00:00
Code Issues Projects Releases Wiki Activity

samba: replace pam packageconfig by hard dependency

Browse Source 
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>
This commit is contained in:
Andreas Müller
2016-09-17 12:04:42 +02:00
committed by Joe MacDonald
parent 3fdfdd8ff4
commit a95726df4b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+3 -4
View File
@@ -28,7 +28,7 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d
# remove default added RDEPENDS on perl # remove default added RDEPENDS on perl
RDEPENDS_${PN}_remove = "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_linuxstdbase = "lsb"
SYSVINITTYPE = "sysv" SYSVINITTYPE = "sysv"
@@ -36,8 +36,7 @@ SYSVINITTYPE = "sysv"
INITSCRIPT_NAME = "samba.sh" INITSCRIPT_NAME = "samba.sh"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \
acl cups ldap \ acl cups ldap \
@@ -48,7 +47,6 @@ RDEPENDS_${PN}-ctdb-tests += "bash"
PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl"
PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
PACKAGECONFIG[pam] = "--with-pam --with-pammodulesdir=${base_libdir}/security,--without-pam,libpam"
PACKAGECONFIG[lsb] = ",,lsb" PACKAGECONFIG[lsb] = ",,lsb"
PACKAGECONFIG[sysv] = ",,sysvinit" PACKAGECONFIG[sysv] = ",,sysvinit"
PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
@@ -85,6 +83,7 @@ EXTRA_OECONF += "--enable-fhs \
--with-cluster-support \ --with-cluster-support \
--with-profiling-data \ --with-profiling-data \
--with-libiconv=${STAGING_DIR_HOST}${prefix} \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \
--with-pam --with-pammodulesdir=${base_libdir}/security \
" "
DISABLE_STATIC = "" DISABLE_STATIC = ""