diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-30 03:12:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-31 23:40:49 +0100 |
commit | 823ba6e30850db602098111a1721351a8cbc2da1 (patch) | |
tree | 718ef8b0b61950b112dccd922f09e3c01e2b39ad | |
parent | 08c88610c958a9f939ba78380849e3342ca0df3a (diff) | |
download | poky-823ba6e30850db602098111a1721351a8cbc2da1.tar.gz |
libpam: remove MLPREFIX from PN
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]
(From OE-Core rev: 804c1284891c2654e1431fe4d777ca41ac466120)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 5 |
1 files 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 183480d85b..3de7d095f8 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb | |||
@@ -102,13 +102,12 @@ python populate_packages_prepend () { | |||
102 | def pam_plugin_hook(file, pkg, pattern, format, basename): | 102 | def pam_plugin_hook(file, pkg, pattern, format, basename): |
103 | pn = d.getVar('PN', True) | 103 | pn = d.getVar('PN', True) |
104 | libpam_suffix = d.getVar('libpam_suffix', True) | 104 | libpam_suffix = d.getVar('libpam_suffix', True) |
105 | mlprefix = d.getVar('MLPREFIX', True) or '' | ||
106 | 105 | ||
107 | rdeps = d.getVar('RDEPENDS_' + pkg, True) | 106 | rdeps = d.getVar('RDEPENDS_' + pkg, True) |
108 | if rdeps: | 107 | if rdeps: |
109 | rdeps = rdeps + " " + mlprefix + pn + "-" + libpam_suffix | 108 | rdeps = rdeps + " " + pn + "-" + libpam_suffix |
110 | else: | 109 | else: |
111 | rdeps = mlprefix + pn + "-" + libpam_suffix | 110 | rdeps = pn + "-" + libpam_suffix |
112 | d.setVar('RDEPENDS_' + pkg, rdeps) | 111 | d.setVar('RDEPENDS_' + pkg, rdeps) |
113 | 112 | ||
114 | provides = d.getVar('RPROVIDES_' + pkg, True) | 113 | provides = d.getVar('RPROVIDES_' + pkg, True) |