From 65250a5537da220dff662269cb81d086b66c2ace Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 23 Nov 2016 13:22:02 +0000 Subject: 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\) Signed-off-by: Joshua Lock --- meta/recipes-extended/pam/libpam_1.3.0.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/recipes-extended/pam/libpam_1.3.0.bb') 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" PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" def get_multilib_bit(d): - baselib = d.getVar('baselib', True) or '' + baselib = d.getVar('baselib') or '' return baselib.replace('lib', '') libpam_suffix = "suffix${@get_multilib_bit(d)}" @@ -92,30 +92,30 @@ RRECOMMENDS_${PN}_class-native = "" python populate_packages_prepend () { def pam_plugin_append_file(pn, dir, file): nf = os.path.join(dir, file) - of = d.getVar('FILES_' + pn, True) + of = d.getVar('FILES_' + pn) if of: nf = of + " " + nf d.setVar('FILES_' + pn, nf) def pam_plugin_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN', True) - libpam_suffix = d.getVar('libpam_suffix', True) + pn = d.getVar('PN') + libpam_suffix = d.getVar('libpam_suffix') - rdeps = d.getVar('RDEPENDS_' + pkg, True) + rdeps = d.getVar('RDEPENDS_' + pkg) if rdeps: rdeps = rdeps + " " + pn + "-" + libpam_suffix else: rdeps = pn + "-" + libpam_suffix d.setVar('RDEPENDS_' + pkg, rdeps) - provides = d.getVar('RPROVIDES_' + pkg, True) + provides = d.getVar('RPROVIDES_' + pkg) if provides: provides = provides + " " + pkg + "-" + libpam_suffix else: provides = pkg + "-" + libpam_suffix d.setVar('RPROVIDES_' + pkg, provides) - mlprefix = d.getVar('MLPREFIX', True) or '' + mlprefix = d.getVar('MLPREFIX') or '' dvar = bb.data.expand('${WORKDIR}/package', d, True) pam_libdir = d.expand('${base_libdir}/security') pam_sbindir = d.expand('${sbindir}') -- cgit 1.2.3-korg