mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
Joshua Lock
committed by
Richard Purdie
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
+54
-54
@@ -6,7 +6,7 @@ SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \
|
||||
gzip gawk chrpath wget cpio perl file"
|
||||
|
||||
def bblayers_conf_file(d):
|
||||
return os.path.join(d.getVar('TOPDIR', True), 'conf/bblayers.conf')
|
||||
return os.path.join(d.getVar('TOPDIR'), 'conf/bblayers.conf')
|
||||
|
||||
def sanity_conf_read(fn):
|
||||
with open(fn, 'r') as f:
|
||||
@@ -39,8 +39,8 @@ SANITY_DIFF_TOOL ?= "meld"
|
||||
SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/local.conf.sample"
|
||||
python oecore_update_localconf() {
|
||||
# Check we are using a valid local.conf
|
||||
current_conf = d.getVar('CONF_VERSION', True)
|
||||
conf_version = d.getVar('LOCALCONF_VERSION', True)
|
||||
current_conf = d.getVar('CONF_VERSION')
|
||||
conf_version = d.getVar('LOCALCONF_VERSION')
|
||||
|
||||
failmsg = """Your version of local.conf was generated from an older/newer version of
|
||||
local.conf.sample and there have been updates made to this file. Please compare the two
|
||||
@@ -59,8 +59,8 @@ is a good way to visualise the changes."""
|
||||
SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/site.conf.sample"
|
||||
python oecore_update_siteconf() {
|
||||
# If we have a site.conf, check it's valid
|
||||
current_sconf = d.getVar('SCONF_VERSION', True)
|
||||
sconf_version = d.getVar('SITE_CONF_VERSION', True)
|
||||
current_sconf = d.getVar('SCONF_VERSION')
|
||||
sconf_version = d.getVar('SITE_CONF_VERSION')
|
||||
|
||||
failmsg = """Your version of site.conf was generated from an older version of
|
||||
site.conf.sample and there have been updates made to this file. Please compare the two
|
||||
@@ -80,8 +80,8 @@ SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/bblayers.conf.sample"
|
||||
python oecore_update_bblayers() {
|
||||
# bblayers.conf is out of date, so see if we can resolve that
|
||||
|
||||
current_lconf = int(d.getVar('LCONF_VERSION', True))
|
||||
lconf_version = int(d.getVar('LAYER_CONF_VERSION', True))
|
||||
current_lconf = int(d.getVar('LCONF_VERSION'))
|
||||
lconf_version = int(d.getVar('LAYER_CONF_VERSION'))
|
||||
|
||||
failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION (has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
|
||||
Please compare your file against bblayers.conf.sample and merge any changes before continuing.
|
||||
@@ -141,7 +141,7 @@ is a good way to visualise the changes."""
|
||||
# Handle rename of meta-yocto -> meta-poky
|
||||
# This marks the start of separate version numbers but code is needed in OE-Core
|
||||
# for the migration, one last time.
|
||||
layers = d.getVar('BBLAYERS', True).split()
|
||||
layers = d.getVar('BBLAYERS').split()
|
||||
layers = [ os.path.basename(path) for path in layers ]
|
||||
if 'meta-yocto' in layers:
|
||||
found = False
|
||||
@@ -172,7 +172,7 @@ is a good way to visualise the changes."""
|
||||
}
|
||||
|
||||
def raise_sanity_error(msg, d, network_error=False):
|
||||
if d.getVar("SANITY_USE_EVENTS", True) == "1":
|
||||
if d.getVar("SANITY_USE_EVENTS") == "1":
|
||||
try:
|
||||
bb.event.fire(bb.event.SanityCheckFailed(msg, network_error), d)
|
||||
except TypeError:
|
||||
@@ -198,7 +198,7 @@ def check_toolchain_tune_args(data, tune, multilib, errs):
|
||||
return found_errors
|
||||
|
||||
def check_toolchain_args_present(data, tune, multilib, tune_errors, which):
|
||||
args_set = (data.getVar("TUNE_%s" % which, True) or "").split()
|
||||
args_set = (data.getVar("TUNE_%s" % which) or "").split()
|
||||
args_wanted = (data.getVar("TUNEABI_REQUIRED_%s_tune-%s" % (which, tune), True) or "").split()
|
||||
args_missing = []
|
||||
|
||||
@@ -228,7 +228,7 @@ def check_toolchain_tune(data, tune, multilib):
|
||||
localdata.setVar("OVERRIDES", overrides)
|
||||
bb.data.update_data(localdata)
|
||||
bb.debug(2, "Sanity-checking tuning '%s' (%s) features:" % (tune, multilib))
|
||||
features = (localdata.getVar("TUNE_FEATURES_tune-%s" % tune, True) or "").split()
|
||||
features = (localdata.getVar("TUNE_FEATURES_tune-%s" % tune) or "").split()
|
||||
if not features:
|
||||
return "Tuning '%s' has no defined features, and cannot be used." % tune
|
||||
valid_tunes = localdata.getVarFlags('TUNEVALID') or {}
|
||||
@@ -248,9 +248,9 @@ def check_toolchain_tune(data, tune, multilib):
|
||||
bb.debug(2, " %s: %s" % (feature, valid_tunes[feature]))
|
||||
else:
|
||||
tune_errors.append("Feature '%s' is not defined." % feature)
|
||||
whitelist = localdata.getVar("TUNEABI_WHITELIST", True)
|
||||
whitelist = localdata.getVar("TUNEABI_WHITELIST")
|
||||
if whitelist:
|
||||
tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune, True)
|
||||
tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune)
|
||||
if not tuneabi:
|
||||
tuneabi = tune
|
||||
if True not in [x in whitelist.split() for x in tuneabi.split()]:
|
||||
@@ -264,13 +264,13 @@ def check_toolchain_tune(data, tune, multilib):
|
||||
|
||||
def check_toolchain(data):
|
||||
tune_error_set = []
|
||||
deftune = data.getVar("DEFAULTTUNE", True)
|
||||
deftune = data.getVar("DEFAULTTUNE")
|
||||
tune_errors = check_toolchain_tune(data, deftune, 'default')
|
||||
if tune_errors:
|
||||
tune_error_set.append(tune_errors)
|
||||
|
||||
multilibs = (data.getVar("MULTILIB_VARIANTS", True) or "").split()
|
||||
global_multilibs = (data.getVar("MULTILIB_GLOBAL_VARIANTS", True) or "").split()
|
||||
multilibs = (data.getVar("MULTILIB_VARIANTS") or "").split()
|
||||
global_multilibs = (data.getVar("MULTILIB_GLOBAL_VARIANTS") or "").split()
|
||||
|
||||
if multilibs:
|
||||
seen_libs = []
|
||||
@@ -282,7 +282,7 @@ def check_toolchain(data):
|
||||
seen_libs.append(lib)
|
||||
if not lib in global_multilibs:
|
||||
tune_error_set.append("Multilib %s is not present in MULTILIB_GLOBAL_VARIANTS" % lib)
|
||||
tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True)
|
||||
tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib)
|
||||
if tune in seen_tunes:
|
||||
tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune)
|
||||
else:
|
||||
@@ -360,10 +360,10 @@ def check_connectivity(d):
|
||||
# URI's to check can be set in the CONNECTIVITY_CHECK_URIS variable
|
||||
# using the same syntax as for SRC_URI. If the variable is not set
|
||||
# the check is skipped
|
||||
test_uris = (d.getVar('CONNECTIVITY_CHECK_URIS', True) or "").split()
|
||||
test_uris = (d.getVar('CONNECTIVITY_CHECK_URIS') or "").split()
|
||||
retval = ""
|
||||
|
||||
bbn = d.getVar('BB_NO_NETWORK', True)
|
||||
bbn = d.getVar('BB_NO_NETWORK')
|
||||
if bbn not in (None, '0', '1'):
|
||||
return 'BB_NO_NETWORK should be "0" or "1", but it is "%s"' % bbn
|
||||
|
||||
@@ -382,7 +382,7 @@ def check_connectivity(d):
|
||||
except Exception as err:
|
||||
# Allow the message to be configured so that users can be
|
||||
# pointed to a support mechanism.
|
||||
msg = data.getVar('CONNECTIVITY_CHECK_MSG', True) or ""
|
||||
msg = data.getVar('CONNECTIVITY_CHECK_MSG') or ""
|
||||
if len(msg) == 0:
|
||||
msg = "%s.\n" % err
|
||||
msg += " Please ensure your host's network is configured correctly,\n"
|
||||
@@ -395,7 +395,7 @@ def check_connectivity(d):
|
||||
def check_supported_distro(sanity_data):
|
||||
from fnmatch import fnmatch
|
||||
|
||||
tested_distros = sanity_data.getVar('SANITY_TESTED_DISTROS', True)
|
||||
tested_distros = sanity_data.getVar('SANITY_TESTED_DISTROS')
|
||||
if not tested_distros:
|
||||
return
|
||||
|
||||
@@ -418,17 +418,17 @@ def check_sanity_validmachine(sanity_data):
|
||||
messages = ""
|
||||
|
||||
# Check TUNE_ARCH is set
|
||||
if sanity_data.getVar('TUNE_ARCH', True) == 'INVALID':
|
||||
if sanity_data.getVar('TUNE_ARCH') == 'INVALID':
|
||||
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE configuration includes a valid tune configuration file which will set this correctly.\n'
|
||||
|
||||
# Check TARGET_OS is set
|
||||
if sanity_data.getVar('TARGET_OS', True) == 'INVALID':
|
||||
if sanity_data.getVar('TARGET_OS') == 'INVALID':
|
||||
messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
|
||||
|
||||
# Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS
|
||||
pkgarchs = sanity_data.getVar('PACKAGE_ARCHS', True)
|
||||
tunepkg = sanity_data.getVar('TUNE_PKGARCH', True)
|
||||
defaulttune = sanity_data.getVar('DEFAULTTUNE', True)
|
||||
pkgarchs = sanity_data.getVar('PACKAGE_ARCHS')
|
||||
tunepkg = sanity_data.getVar('TUNE_PKGARCH')
|
||||
defaulttune = sanity_data.getVar('DEFAULTTUNE')
|
||||
tunefound = False
|
||||
seen = {}
|
||||
dups = []
|
||||
@@ -476,7 +476,7 @@ def check_gcc_march(sanity_data):
|
||||
result = True;
|
||||
|
||||
if not result:
|
||||
build_arch = sanity_data.getVar('BUILD_ARCH', True)
|
||||
build_arch = sanity_data.getVar('BUILD_ARCH')
|
||||
status,res = oe.utils.getstatusoutput(sanity_data.expand("${BUILD_CC} -march=%s gcc_test.c -o gcc_test" % build_arch))
|
||||
if status == 0:
|
||||
message = "BUILD_CFLAGS_append = \" -march=%s\"" % build_arch
|
||||
@@ -564,11 +564,11 @@ def check_perl_modules(sanity_data):
|
||||
return None
|
||||
|
||||
def sanity_check_conffiles(d):
|
||||
funcs = d.getVar('BBLAYERS_CONF_UPDATE_FUNCS', True).split()
|
||||
funcs = d.getVar('BBLAYERS_CONF_UPDATE_FUNCS').split()
|
||||
for func in funcs:
|
||||
conffile, current_version, required_version, func = func.split(":")
|
||||
if check_conf_exists(conffile, d) and d.getVar(current_version, True) is not None and \
|
||||
d.getVar(current_version, True) != d.getVar(required_version, True):
|
||||
if check_conf_exists(conffile, d) and d.getVar(current_version) is not None and \
|
||||
d.getVar(current_version) != d.getVar(required_version):
|
||||
try:
|
||||
bb.build.exec_func(func, d, pythonexception=True)
|
||||
except NotImplementedError as e:
|
||||
@@ -581,8 +581,8 @@ def sanity_handle_abichanges(status, d):
|
||||
#
|
||||
import subprocess
|
||||
|
||||
current_abi = d.getVar('OELAYOUT_ABI', True)
|
||||
abifile = d.getVar('SANITY_ABIFILE', True)
|
||||
current_abi = d.getVar('OELAYOUT_ABI')
|
||||
abifile = d.getVar('SANITY_ABIFILE')
|
||||
if os.path.exists(abifile):
|
||||
with open(abifile, "r") as f:
|
||||
abi = f.read().strip()
|
||||
@@ -677,12 +677,12 @@ def check_sanity_version_change(status, d):
|
||||
missing = missing + "GNU make,"
|
||||
|
||||
if not check_app_exists('${BUILD_CC}', d):
|
||||
missing = missing + "C Compiler (%s)," % d.getVar("BUILD_CC", True)
|
||||
missing = missing + "C Compiler (%s)," % d.getVar("BUILD_CC")
|
||||
|
||||
if not check_app_exists('${BUILD_CXX}', d):
|
||||
missing = missing + "C++ Compiler (%s)," % d.getVar("BUILD_CXX", True)
|
||||
missing = missing + "C++ Compiler (%s)," % d.getVar("BUILD_CXX")
|
||||
|
||||
required_utilities = d.getVar('SANITY_REQUIRED_UTILITIES', True)
|
||||
required_utilities = d.getVar('SANITY_REQUIRED_UTILITIES')
|
||||
|
||||
for util in required_utilities.split():
|
||||
if not check_app_exists(util, d):
|
||||
@@ -692,7 +692,7 @@ def check_sanity_version_change(status, d):
|
||||
missing = missing.rstrip(',')
|
||||
status.addresult("Please install the following missing utilities: %s\n" % missing)
|
||||
|
||||
assume_provided = d.getVar('ASSUME_PROVIDED', True).split()
|
||||
assume_provided = d.getVar('ASSUME_PROVIDED').split()
|
||||
# Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
|
||||
if "diffstat-native" not in assume_provided:
|
||||
status.addresult('Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n')
|
||||
@@ -715,7 +715,7 @@ def check_sanity_version_change(status, d):
|
||||
status.addresult(" __sync_bool_compare_and_swap (&atomic, 2, 3);\n")
|
||||
|
||||
# Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS)
|
||||
tmpdir = d.getVar('TMPDIR', True)
|
||||
tmpdir = d.getVar('TMPDIR')
|
||||
status.addresult(check_create_long_filename(tmpdir, "TMPDIR"))
|
||||
tmpdirmode = os.stat(tmpdir).st_mode
|
||||
if (tmpdirmode & stat.S_ISGID):
|
||||
@@ -739,7 +739,7 @@ def check_sanity_version_change(status, d):
|
||||
if netcheck:
|
||||
status.network_error = True
|
||||
|
||||
nolibs = d.getVar('NO32LIBS', True)
|
||||
nolibs = d.getVar('NO32LIBS')
|
||||
if not nolibs:
|
||||
lib32path = '/lib'
|
||||
if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
|
||||
@@ -748,7 +748,7 @@ def check_sanity_version_change(status, d):
|
||||
if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
|
||||
status.addresult("You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n")
|
||||
|
||||
bbpaths = d.getVar('BBPATH', True).split(":")
|
||||
bbpaths = d.getVar('BBPATH').split(":")
|
||||
if ("." in bbpaths or "./" in bbpaths or "" in bbpaths):
|
||||
status.addresult("BBPATH references the current directory, either through " \
|
||||
"an empty entry, a './' or a '.'.\n\t This is unsafe and means your "\
|
||||
@@ -758,7 +758,7 @@ def check_sanity_version_change(status, d):
|
||||
"references.\n" \
|
||||
"Parsed BBPATH is" + str(bbpaths));
|
||||
|
||||
oes_bb_conf = d.getVar( 'OES_BITBAKE_CONF', True)
|
||||
oes_bb_conf = d.getVar( 'OES_BITBAKE_CONF')
|
||||
if not oes_bb_conf:
|
||||
status.addresult('You are not using the OpenEmbedded version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n')
|
||||
|
||||
@@ -793,26 +793,26 @@ def check_sanity_everybuild(status, d):
|
||||
|
||||
# Check the bitbake version meets minimum requirements
|
||||
from distutils.version import LooseVersion
|
||||
minversion = d.getVar('BB_MIN_VERSION', True)
|
||||
minversion = d.getVar('BB_MIN_VERSION')
|
||||
if (LooseVersion(bb.__version__) < LooseVersion(minversion)):
|
||||
status.addresult('Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__))
|
||||
|
||||
sanity_check_locale(d)
|
||||
|
||||
paths = d.getVar('PATH', True).split(":")
|
||||
paths = d.getVar('PATH').split(":")
|
||||
if "." in paths or "./" in paths or "" in paths:
|
||||
status.addresult("PATH contains '.', './' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
|
||||
|
||||
# Check that the DISTRO is valid, if set
|
||||
# need to take into account DISTRO renaming DISTRO
|
||||
distro = d.getVar('DISTRO', True)
|
||||
distro = d.getVar('DISTRO')
|
||||
if distro and distro != "nodistro":
|
||||
if not ( check_conf_exists("conf/distro/${DISTRO}.conf", d) or check_conf_exists("conf/distro/include/${DISTRO}.inc", d) ):
|
||||
status.addresult("DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % d.getVar("DISTRO", True))
|
||||
status.addresult("DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % d.getVar("DISTRO"))
|
||||
|
||||
# Check that DL_DIR is set, exists and is writable. In theory, we should never even hit the check if DL_DIR isn't
|
||||
# set, since so much relies on it being set.
|
||||
dldir = d.getVar('DL_DIR', True)
|
||||
dldir = d.getVar('DL_DIR')
|
||||
if not dldir:
|
||||
status.addresult("DL_DIR is not set. Your environment is misconfigured, check that DL_DIR is set, and if the directory exists, that it is writable. \n")
|
||||
if os.path.exists(dldir) and not os.access(dldir, os.W_OK):
|
||||
@@ -821,7 +821,7 @@ def check_sanity_everybuild(status, d):
|
||||
|
||||
# Check that the MACHINE is valid, if it is set
|
||||
machinevalid = True
|
||||
if d.getVar('MACHINE', True):
|
||||
if d.getVar('MACHINE'):
|
||||
if not check_conf_exists("conf/machine/${MACHINE}.conf", d):
|
||||
status.addresult('Please set a valid MACHINE in your local.conf or environment\n')
|
||||
machinevalid = False
|
||||
@@ -834,7 +834,7 @@ def check_sanity_everybuild(status, d):
|
||||
status.addresult(check_toolchain(d))
|
||||
|
||||
# Check that the SDKMACHINE is valid, if it is set
|
||||
if d.getVar('SDKMACHINE', True):
|
||||
if d.getVar('SDKMACHINE'):
|
||||
if not check_conf_exists("conf/machine-sdk/${SDKMACHINE}.conf", d):
|
||||
status.addresult('Specified SDKMACHINE value is not valid\n')
|
||||
elif d.getVar('SDK_ARCH', False) == "${BUILD_ARCH}":
|
||||
@@ -847,7 +847,7 @@ def check_sanity_everybuild(status, d):
|
||||
status.addresult("Please use a umask which allows a+rx and u+rwx\n")
|
||||
os.umask(omask)
|
||||
|
||||
if d.getVar('TARGET_ARCH', True) == "arm":
|
||||
if d.getVar('TARGET_ARCH') == "arm":
|
||||
# This path is no longer user-readable in modern (very recent) Linux
|
||||
try:
|
||||
if os.path.exists("/proc/sys/vm/mmap_min_addr"):
|
||||
@@ -860,7 +860,7 @@ def check_sanity_everybuild(status, d):
|
||||
except:
|
||||
pass
|
||||
|
||||
oeroot = d.getVar('COREBASE', True)
|
||||
oeroot = d.getVar('COREBASE')
|
||||
if oeroot.find('+') != -1:
|
||||
status.addresult("Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include any + characters.")
|
||||
if oeroot.find('@') != -1:
|
||||
@@ -875,7 +875,7 @@ def check_sanity_everybuild(status, d):
|
||||
'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \
|
||||
'bzr', 'cvs', 'npm', 'sftp', 'ssh']
|
||||
for mirror_var in mirror_vars:
|
||||
mirrors = (d.getVar(mirror_var, True) or '').replace('\\n', '\n').split('\n')
|
||||
mirrors = (d.getVar(mirror_var) or '').replace('\\n', '\n').split('\n')
|
||||
for mirror_entry in mirrors:
|
||||
mirror_entry = mirror_entry.strip()
|
||||
if not mirror_entry:
|
||||
@@ -914,7 +914,7 @@ def check_sanity_everybuild(status, d):
|
||||
check_symlink(mirror_base, d)
|
||||
|
||||
# Check that TMPDIR hasn't changed location since the last time we were run
|
||||
tmpdir = d.getVar('TMPDIR', True)
|
||||
tmpdir = d.getVar('TMPDIR')
|
||||
checkfile = os.path.join(tmpdir, "saved_tmpdir")
|
||||
if os.path.exists(checkfile):
|
||||
with open(checkfile, "r") as f:
|
||||
@@ -951,8 +951,8 @@ def check_sanity(sanity_data):
|
||||
|
||||
status = SanityStatus()
|
||||
|
||||
tmpdir = sanity_data.getVar('TMPDIR', True)
|
||||
sstate_dir = sanity_data.getVar('SSTATE_DIR', True)
|
||||
tmpdir = sanity_data.getVar('TMPDIR')
|
||||
sstate_dir = sanity_data.getVar('SSTATE_DIR')
|
||||
|
||||
check_symlink(sstate_dir, sanity_data)
|
||||
|
||||
@@ -976,7 +976,7 @@ def check_sanity(sanity_data):
|
||||
|
||||
check_sanity_everybuild(status, sanity_data)
|
||||
|
||||
sanity_version = int(sanity_data.getVar('SANITY_VERSION', True) or 1)
|
||||
sanity_version = int(sanity_data.getVar('SANITY_VERSION') or 1)
|
||||
network_error = False
|
||||
# NATIVELSBSTRING var may have been overridden with "universal", so
|
||||
# get actual host distribution id and version
|
||||
|
||||
Reference in New Issue
Block a user