diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 08:30:03 +0000 |
commit | 7c552996597faaee2fbee185b250c0ee30ea3b5f (patch) | |
tree | bb74186da3e2d4b03c33875a71fbe340ba09a0d7 /meta/recipes-extended | |
parent | 84ec50e587e7464b260b1b189659b93b6dab0ef6 (diff) | |
download | openembedded-core-contrib-7c552996597faaee2fbee185b250c0ee30ea3b5f.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\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/man/man_1.6g.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.3.0.bb | 14 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_3.3.12.bb | 8 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_6.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/tzdata/tzdata_2016i.bb | 2 |
9 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index e18980bcca..2ce9c7a179 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -83,7 +83,7 @@ do_install () { python do_package_append() { import subprocess # Change permissions back the way they were, they probably had a reason... - workdir = d.getVar('WORKDIR', True) + workdir = d.getVar('WORKDIR') subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) } diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index e78aa18cbc..ff603f842c 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb @@ -10,8 +10,8 @@ PR = "r1" DEPENDS = "groff less" def compress_pkg(d): - if "compress_doc" in (d.getVar("INHERIT", True) or "").split(): - compress = d.getVar("DOC_COMPRESS", True) + if "compress_doc" in (d.getVar("INHERIT") or "").split(): + compress = d.getVar("DOC_COMPRESS") if compress == "gz": return "gzip" elif compress == "bz2": diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 47a68a59ac..49a65f873a 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -106,10 +106,10 @@ ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" ALTERNATIVE_PRIORITY[hostname.1] = "10" python __anonymous() { - for prog in d.getVar('base_sbindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) - for prog in d.getVar('base_bindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) } ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index a60a68cbf2..d8975f2157 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -31,7 +31,7 @@ python __anonymous () { namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" - packages = d.getVar("PACKAGES", True).split() + packages = d.getVar("PACKAGES").split() for pkg in packages: if pkg.endswith('-dev'): mapped = namemap.get(pkg[:-4], None) diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 29564e0c9d..734dda1d79 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -15,9 +15,9 @@ REQUIRED_DISTRO_FEATURES = "x11" # We will skip parsing this packagegeoup for non-glibc systems # python __anonymous () { - if d.getVar('TCLIBC', True) != "glibc": + if d.getVar('TCLIBC') != "glibc": raise bb.parse.SkipPackage("incompatible with %s C library" % - d.getVar('TCLIBC', True)) + d.getVar('TCLIBC')) } PACKAGES = "\ 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}') diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.12.bb index 4ca1a5023b..1f793b9cac 100644 --- a/meta/recipes-extended/procps/procps_3.3.12.bb +++ b/meta/recipes-extended/procps/procps_3.3.12.bb @@ -57,10 +57,10 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" python __anonymous() { - for prog in d.getVar('base_bindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) - for prog in d.getVar('base_sbindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) } diff --git a/meta/recipes-extended/texinfo/texinfo_6.3.bb b/meta/recipes-extended/texinfo/texinfo_6.3.bb index 51199be758..d82731e11e 100644 --- a/meta/recipes-extended/texinfo/texinfo_6.3.bb +++ b/meta/recipes-extended/texinfo/texinfo_6.3.bb @@ -11,7 +11,7 @@ PROVIDES_append_class-native = " texinfo-replacement-native" def compress_pkg(d): if bb.data.inherits_class('compress_doc', d): - compress = d.getVar("DOC_COMPRESS", True) + compress = d.getVar("DOC_COMPRESS") if compress == "gz": return "gzip" elif compress == "bz2": diff --git a/meta/recipes-extended/tzdata/tzdata_2016i.bb b/meta/recipes-extended/tzdata/tzdata_2016i.bb index 3801a3fced..46488cda58 100644 --- a/meta/recipes-extended/tzdata/tzdata_2016i.bb +++ b/meta/recipes-extended/tzdata/tzdata_2016i.bb @@ -209,5 +209,5 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/iso3166.tab \ ${datadir}/zoneinfo/Etc/*" -CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE', True)) else "" }" +CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }" CONFFILES_${PN} += "${sysconfdir}/localtime" |