summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/pam
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/pam')
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.6.bb21
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}"
73RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" 73RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
74 74
75RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ 75RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \
76 pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} \ 76 ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \
77 pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix} \ 77 ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \
78 ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \
79 ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \
78 " 80 "
79RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ 81RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
80 pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} \ 82 ${MLPREFIX}pam-plugin-access-${libpam_suffix} \
81 pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \ 83 ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \
82 pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \ 84 ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
85 ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
86 ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \
87 ${MLPREFIX}pam-plugin-time-${libpam_suffix} \
83 coreutils bash" 88 coreutils bash"
84 89
85# FIXME: Native suffix breaks here, disable it for now 90# FIXME: Native suffix breaks here, disable it for now
@@ -113,13 +118,15 @@ python populate_packages_prepend () {
113 provides = pkg + "-" + libpam_suffix 118 provides = pkg + "-" + libpam_suffix
114 d.setVar('RPROVIDES_' + pkg, provides) 119 d.setVar('RPROVIDES_' + pkg, provides)
115 120
121 mlprefix = d.getVar('MLPREFIX', True) or ''
116 dvar = bb.data.expand('${WORKDIR}/package', d, True) 122 dvar = bb.data.expand('${WORKDIR}/package', d, True)
117 pam_libdir = d.expand('${base_libdir}/security') 123 pam_libdir = d.expand('${base_libdir}/security')
118 pam_sbindir = d.expand('${sbindir}') 124 pam_sbindir = d.expand('${sbindir}')
119 pam_filterdir = d.expand('${base_libdir}/security/pam_filter') 125 pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
126 pam_pkgname = mlprefix + 'pam-plugin%s'
120 127
121 do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') 128 do_split_packages(d, pam_libdir, '^pam(.*)\.so$', pam_pkgname,
122 mlprefix = d.getVar('MLPREFIX', True) or '' 129 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='')
123 pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') 130 pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd')
124 pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') 131 pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update')
125 pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') 132 pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally')