mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 20:07:25 +00:00
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>
This commit is contained in:
committed by
Martin Jansa
parent
761639b9d7
commit
efd3696e70
@@ -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)
|
||||
|
||||
@@ -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():
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user