Patchwork [1/6] libpam: enable multilib

login
register
mail settings
Submitter Constantin Musca
Date Dec. 27, 2012, 2:13 p.m.
Message ID <51a8c0083657fa7c500c2c54c96e3cca62333dbe.1356617488.git.constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/41717/
State Accepted
Commit 785512a306ad1b9bf921d1b153e584c0e9e348d0
Headers show

Comments

Constantin Musca - Dec. 27, 2012, 2:13 p.m.
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>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Patch

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index fae0467..93c98c0 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='')
 }