diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-08-28 20:33:20 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-31 23:39:12 +0100 |
| commit | 48ca9989e4ac098532d3e0d4ce2a59eab9159b24 (patch) | |
| tree | ab33c7325921e3c2b1ac8390b8732165927ae4e4 /meta/recipes-extended/pam | |
| parent | bb25eac63cb9b2d0e1a45f5002a5e90562471aa1 (diff) | |
| download | openembedded-core-48ca9989e4ac098532d3e0d4ce2a59eab9159b24.tar.gz openembedded-core-48ca9989e4ac098532d3e0d4ce2a59eab9159b24.tar.bz2 openembedded-core-48ca9989e4ac098532d3e0d4ce2a59eab9159b24.zip | |
libpam: Fix multilib packaging
The plugin runtime dependencies were not including the multilib
prefix, fix it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pam')
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index f08b4af544..183480d85b 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb @@ -73,13 +73,18 @@ RPROVIDES_${PN} += "${PN}-${libpam_suffix}" RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ - pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} \ - pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-deny-${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} \ - pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} \ - pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \ - pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-debug-${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" # FIXME: Native suffix breaks here, disable it for now @@ -113,13 +118,15 @@ python populate_packages_prepend () { provides = pkg + "-" + libpam_suffix d.setVar('RPROVIDES_' + pkg, provides) + mlprefix = d.getVar('MLPREFIX', True) or '' dvar = bb.data.expand('${WORKDIR}/package', d, True) pam_libdir = d.expand('${base_libdir}/security') pam_sbindir = d.expand('${sbindir}') 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='') - mlprefix = d.getVar('MLPREFIX', True) or '' + do_split_packages(d, pam_libdir, '^pam(.*)\.so$', pam_pkgname, + '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_update') pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') |