summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/pam
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 10:23:23 +0000
commitc4e2c59088765d1f1de7ec57cde91980f887c2ff (patch)
treea2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-extended/pam
parentd5e67725ac11e3296cad104470931ffa16824b90 (diff)
downloadpoky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pam')
-rw-r--r--meta/recipes-extended/pam/libpam_1.3.0.bb14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb
index bb5a4bd8d3..67b9d53d33 100644
--- a/meta/recipes-extended/pam/libpam_1.3.0.bb
+++ b/meta/recipes-extended/pam/libpam_1.3.0.bb
@@ -62,7 +62,7 @@ FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests"
62PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" 62PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*"
63 63
64def get_multilib_bit(d): 64def get_multilib_bit(d):
65 baselib = d.getVar('baselib', True) or '' 65 baselib = d.getVar('baselib') or ''
66 return baselib.replace('lib', '') 66 return baselib.replace('lib', '')
67 67
68libpam_suffix = "suffix${@get_multilib_bit(d)}" 68libpam_suffix = "suffix${@get_multilib_bit(d)}"
@@ -92,30 +92,30 @@ RRECOMMENDS_${PN}_class-native = ""
92python populate_packages_prepend () { 92python populate_packages_prepend () {
93 def pam_plugin_append_file(pn, dir, file): 93 def pam_plugin_append_file(pn, dir, file):
94 nf = os.path.join(dir, file) 94 nf = os.path.join(dir, file)
95 of = d.getVar('FILES_' + pn, True) 95 of = d.getVar('FILES_' + pn)
96 if of: 96 if of:
97 nf = of + " " + nf 97 nf = of + " " + nf
98 d.setVar('FILES_' + pn, nf) 98 d.setVar('FILES_' + pn, nf)
99 99
100 def pam_plugin_hook(file, pkg, pattern, format, basename): 100 def pam_plugin_hook(file, pkg, pattern, format, basename):
101 pn = d.getVar('PN', True) 101 pn = d.getVar('PN')
102 libpam_suffix = d.getVar('libpam_suffix', True) 102 libpam_suffix = d.getVar('libpam_suffix')
103 103
104 rdeps = d.getVar('RDEPENDS_' + pkg, True) 104 rdeps = d.getVar('RDEPENDS_' + pkg)
105 if rdeps: 105 if rdeps:
106 rdeps = rdeps + " " + pn + "-" + libpam_suffix 106 rdeps = rdeps + " " + pn + "-" + libpam_suffix
107 else: 107 else:
108 rdeps = pn + "-" + libpam_suffix 108 rdeps = pn + "-" + libpam_suffix
109 d.setVar('RDEPENDS_' + pkg, rdeps) 109 d.setVar('RDEPENDS_' + pkg, rdeps)
110 110
111 provides = d.getVar('RPROVIDES_' + pkg, True) 111 provides = d.getVar('RPROVIDES_' + pkg)
112 if provides: 112 if provides:
113 provides = provides + " " + pkg + "-" + libpam_suffix 113 provides = provides + " " + pkg + "-" + libpam_suffix
114 else: 114 else:
115 provides = pkg + "-" + libpam_suffix 115 provides = pkg + "-" + libpam_suffix
116 d.setVar('RPROVIDES_' + pkg, provides) 116 d.setVar('RPROVIDES_' + pkg, provides)
117 117
118 mlprefix = d.getVar('MLPREFIX', True) or '' 118 mlprefix = d.getVar('MLPREFIX') or ''
119 dvar = bb.data.expand('${WORKDIR}/package', d, True) 119 dvar = bb.data.expand('${WORKDIR}/package', d, True)
120 pam_libdir = d.expand('${base_libdir}/security') 120 pam_libdir = d.expand('${base_libdir}/security')
121 pam_sbindir = d.expand('${sbindir}') 121 pam_sbindir = d.expand('${sbindir}')