aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-21 01:01:18 +0200
committerSaul Wold <sgw@linux.intel.com>2013-01-04 22:01:21 -0800
commit1dbb0bc048ceaf4cd2879362ae4a0f1398809349 (patch)
treece7c2ddef18df5867c4e4aed48c57f3abb3c2998 /meta
parent35291c97edc05756788d206457c56dcc41edb637 (diff)
downloadopenembedded-core-contrib-1dbb0bc048ceaf4cd2879362ae4a0f1398809349.tar.gz
libpam: enable multilib
Fix the following warning: WARNING: QA Issue: lib32-libpam: Files/directories were installed but not shipped /usr/sbin/unix_chkpwd /usr/sbin/pam_tally2 /usr/sbin/mkhomedir_helper /usr/sbin/unix_update /usr/sbin/pam_timestamp_check /usr/sbin/pam_tally Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.6.bb15
1 files changed, 8 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 fae0467e01f..93c98c0908a 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF = "--with-db-uniquename=_pam \
CFLAGS_append = " -fPIC "
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/Linux-PAM-${PV}"
@@ -66,12 +66,13 @@ python populate_packages_prepend () {
pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
- pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd')
- pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_update')
- pam_plugin_append_file('pam-plugin-tally', pam_sbindir, 'pam_tally')
- pam_plugin_append_file('pam-plugin-tally2', pam_sbindir, 'pam_tally2')
- pam_plugin_append_file('pam-plugin-timestamp', pam_sbindir, 'pam_timestamp_check')
- pam_plugin_append_file('pam-plugin-mkhomedir', pam_sbindir, 'mkhomedir_helper')
+ mlprefix = d.getVar('MLPREFIX', True) or ''
+ 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')
+ pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2')
+ pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check')
+ pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper')
do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
}