aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/classes
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-11-25 15:28:52 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-02 09:16:17 +0100
commitefd3696e70a6603f1a45faa4a172433514f0a487 (patch)
treeb72751ba93b050391db05a8e1be7506836b6d515 /meta-oe/classes
parent761639b9d7681c81dd69eaf3a37c32791d6e97fd (diff)
downloadmeta-openembedded-efd3696e70a6603f1a45faa4a172433514f0a487.tar.gz
meta-openembedded-efd3696e70a6603f1a45faa4a172433514f0a487.tar.bz2
meta-openembedded-efd3696e70a6603f1a45faa4a172433514f0a487.zip
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>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r--meta-oe/classes/breakpad.bbclass6
-rw-r--r--meta-oe/classes/gitpkgv.bbclass4
-rw-r--r--meta-oe/classes/gitver.bbclass4
-rw-r--r--meta-oe/classes/machine_kernel_pr.bbclass2
-rw-r--r--meta-oe/classes/socorro-syms.bbclass8
5 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/classes/breakpad.bbclass b/meta-oe/classes/breakpad.bbclass
index b3abf278d..36f11ff48 100644
--- a/meta-oe/classes/breakpad.bbclass
+++ b/meta-oe/classes/breakpad.bbclass
@@ -10,11 +10,11 @@ CXXFLAGS += "-I${STAGING_DIR_TARGET}${includedir}/breakpad "
BREAKPAD_BIN ?= ""
python () {
- breakpad_bin = d.getVar("BREAKPAD_BIN", True)
+ breakpad_bin = d.getVar("BREAKPAD_BIN")
if not breakpad_bin:
- PN = d.getVar("PN", True)
- FILE = os.path.basename(d.getVar("FILE", True))
+ PN = d.getVar("PN")
+ FILE = os.path.basename(d.getVar("FILE"))
bb.error("To build %s, see breakpad.bbclass for instructions on \
setting up your Breakpad configuration" % PN)
raise ValueError('BREAKPAD_BIN not defined in %s' % PN)
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass
index 8cd4bfd1e..3949b43c2 100644
--- a/meta-oe/classes/gitpkgv.bbclass
+++ b/meta-oe/classes/gitpkgv.bbclass
@@ -52,14 +52,14 @@ def get_git_pkgv(d, use_tags):
import bb
from pipes import quote
- src_uri = d.getVar('SRC_URI', 1).split()
+ src_uri = d.getVar('SRC_URI').split()
fetcher = bb.fetch2.Fetch(src_uri, d)
ud = fetcher.ud
#
# If SRCREV_FORMAT is set respect it for tags
#
- format = d.getVar('SRCREV_FORMAT', True)
+ format = d.getVar('SRCREV_FORMAT')
if not format:
names = []
for url in ud.values():
diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index e7b5155ee..71bf42fbc 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -24,7 +24,7 @@ def get_git_pv(path, d, tagadjust=None):
import os
import bb.process
- gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
+ gitdir = os.path.abspath(os.path.join(d.getVar("S"), ".git"))
try:
ver = gitrev_run("git describe --tags", gitdir)
except Exception, exc:
@@ -71,5 +71,5 @@ def mark_recipe_dependencies(path, d):
mark_dependency(d, tagdir)
python () {
- mark_recipe_dependencies(d.getVar("S", True), d)
+ mark_recipe_dependencies(d.getVar("S"), d)
}
diff --git a/meta-oe/classes/machine_kernel_pr.bbclass b/meta-oe/classes/machine_kernel_pr.bbclass
index 463b64d8e..e48bd017f 100644
--- a/meta-oe/classes/machine_kernel_pr.bbclass
+++ b/meta-oe/classes/machine_kernel_pr.bbclass
@@ -1,6 +1,6 @@
python __anonymous () {
- machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
+ machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR')
if machine_kernel_pr:
d.setVar('PR', machine_kernel_pr)
diff --git a/meta-oe/classes/socorro-syms.bbclass b/meta-oe/classes/socorro-syms.bbclass
index 3f6ae6319..cc435aba1 100644
--- a/meta-oe/classes/socorro-syms.bbclass
+++ b/meta-oe/classes/socorro-syms.bbclass
@@ -21,10 +21,10 @@ FILES_${PN}-socorro-syms = "/usr/share/socorro-syms"
python symbol_file_preprocess() {
- package_dir = d.getVar("PKGD", True)
- breakpad_bin = d.getVar("BREAKPAD_BIN", True)
+ package_dir = d.getVar("PKGD")
+ breakpad_bin = d.getVar("BREAKPAD_BIN")
if not breakpad_bin:
- package_name = d.getVar("PN", True)
+ package_name = d.getVar("PN")
bb.error("Package %s depends on Breakpad via socorro-syms. See "
"breakpad.bbclass for instructions on setting up the Breakpad "
"configuration." % package_name)
@@ -106,7 +106,7 @@ def repository_path(d, source_file_path):
# child of the build directory TOPDIR.
git_root_dir = run_command(
"git rev-parse --show-toplevel", os.path.dirname(source_file_path))
- if not git_root_dir.startswith(d.getVar("TOPDIR", True)):
+ if not git_root_dir.startswith(d.getVar("TOPDIR")):
return None
return git_repository_path(source_file_path)