mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +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:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -25,7 +25,7 @@ class BuildProject(metaclass=ABCMeta):
|
||||
# Download self.archive to self.localarchive
|
||||
def _download_archive(self):
|
||||
|
||||
dl_dir = self.d.getVar("DL_DIR", True)
|
||||
dl_dir = self.d.getVar("DL_DIR")
|
||||
if dl_dir and os.path.exists(os.path.join(dl_dir, self.archive)):
|
||||
bb.utils.copyfile(os.path.join(dl_dir, self.archive), self.localarchive)
|
||||
return
|
||||
@@ -40,7 +40,7 @@ class BuildProject(metaclass=ABCMeta):
|
||||
|
||||
cmd = ''
|
||||
for var in exportvars:
|
||||
val = self.d.getVar(var, True)
|
||||
val = self.d.getVar(var)
|
||||
if val:
|
||||
cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)
|
||||
|
||||
@@ -103,8 +103,8 @@ class SDKBuildProject(BuildProject):
|
||||
self.testdir = testpath
|
||||
self.targetdir = testpath
|
||||
bb.utils.mkdirhier(testpath)
|
||||
self.datetime = d.getVar('DATETIME', True)
|
||||
self.testlogdir = d.getVar("TEST_LOG_DIR", True)
|
||||
self.datetime = d.getVar('DATETIME')
|
||||
self.testlogdir = d.getVar("TEST_LOG_DIR")
|
||||
bb.utils.mkdirhier(self.testlogdir)
|
||||
self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime)
|
||||
BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath)
|
||||
|
||||
Reference in New Issue
Block a user