[PATCH 0/1] libpam: remove MLPREFIX from PN

[PATCH 0/1] libpam: remove MLPREFIX from PN

[Robert Yang]

The following changes since commit d2fbc55d6863a767e69092bac686c02c3ec34650:

  populate_sdk_base: Remap TOOLCHAIN_HOST_TASK variable (2014-08-28 15:12:31 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/libpam
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/libpam

Robert Yang (1):
  libpam: remove MLPREFIX from PN

 meta/recipes-extended/pam/libpam_1.1.6.bb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
1.7.9.5

[PATCH 1/1] libpam: remove MLPREFIX from PN

[Robert Yang]

The commit df3038768f59f7a0c814974ff674d4e59cbdfca4 changed 'libpam' to
'pn', then we don't need the "MLPREFIX + pn" any more, otherwise we
would get the name like: "lib32-lib32-libpam-x", and the warn:

WARNING: QA Issue: lib32-pam-plugin-access rdepends on
lib32-lib32-libpam-suffix, but it isn't a build dependency? [build-deps]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index d7033d0..a3fb893 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -94,13 +94,12 @@ python populate_packages_prepend () {
     def pam_plugin_hook(file, pkg, pattern, format, basename):
         pn = d.getVar('PN', True)
         libpam_suffix = d.getVar('libpam_suffix', True)
-        mlprefix = d.getVar('MLPREFIX', True) or ''
 
         rdeps = d.getVar('RDEPENDS_' + pkg, True)
         if rdeps:
-            rdeps = rdeps + " " + mlprefix + pn + "-" + libpam_suffix
+            rdeps = rdeps + " " + pn + "-" + libpam_suffix
         else:
-            rdeps = mlprefix + pn + "-" + libpam_suffix
+            rdeps = pn + "-" + libpam_suffix
         d.setVar('RDEPENDS_' + pkg, rdeps)
 
         provides = d.getVar('RPROVIDES_' + pkg, True)
-- 
1.7.9.5