libpam: Fix multilib packaging
The plugin runtime dependencies were not including the multilib prefix, fix it. (From OE-Core rev: 48ca9989e4ac098532d3e0d4ce2a59eab9159b24) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e145cd5aaa
commit
c07aa7e3b7
|
@ -73,13 +73,18 @@ RPROVIDES_${PN} += "${PN}-${libpam_suffix}"
|
||||||
RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
|
RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
|
||||||
|
|
||||||
RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \
|
RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \
|
||||||
pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} \
|
${MLPREFIX}pam-plugin-deny-${libpam_suffix} \
|
||||||
pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix} \
|
${MLPREFIX}pam-plugin-permit-${libpam_suffix} \
|
||||||
|
${MLPREFIX}pam-plugin-warn-${libpam_suffix} \
|
||||||
|
${MLPREFIX}pam-plugin-unix-${libpam_suffix} \
|
||||||
"
|
"
|
||||||
RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
|
RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
|
||||||
pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} \
|
${MLPREFIX}pam-plugin-access-${libpam_suffix} \
|
||||||
pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \
|
${MLPREFIX}pam-plugin-debug-${libpam_suffix} \
|
||||||
pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \
|
${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
|
||||||
|
${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
|
||||||
|
${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \
|
||||||
|
${MLPREFIX}pam-plugin-time-${libpam_suffix} \
|
||||||
coreutils bash"
|
coreutils bash"
|
||||||
|
|
||||||
# FIXME: Native suffix breaks here, disable it for now
|
# FIXME: Native suffix breaks here, disable it for now
|
||||||
|
@ -113,13 +118,15 @@ python populate_packages_prepend () {
|
||||||
provides = pkg + "-" + libpam_suffix
|
provides = pkg + "-" + libpam_suffix
|
||||||
d.setVar('RPROVIDES_' + pkg, provides)
|
d.setVar('RPROVIDES_' + pkg, provides)
|
||||||
|
|
||||||
|
mlprefix = d.getVar('MLPREFIX', True) or ''
|
||||||
dvar = bb.data.expand('${WORKDIR}/package', d, True)
|
dvar = bb.data.expand('${WORKDIR}/package', d, True)
|
||||||
pam_libdir = d.expand('${base_libdir}/security')
|
pam_libdir = d.expand('${base_libdir}/security')
|
||||||
pam_sbindir = d.expand('${sbindir}')
|
pam_sbindir = d.expand('${sbindir}')
|
||||||
pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
|
pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
|
||||||
|
pam_pkgname = mlprefix + 'pam-plugin%s'
|
||||||
|
|
||||||
do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='')
|
do_split_packages(d, pam_libdir, '^pam(.*)\.so$', pam_pkgname,
|
||||||
mlprefix = d.getVar('MLPREFIX', True) or ''
|
'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='')
|
||||||
pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd')
|
pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd')
|
||||||
pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update')
|
pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update')
|
||||||
pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally')
|
pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally')
|
||||||
|
|
Loading…
Reference in New Issue