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:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -1,8 +1,8 @@
|
||||
def autotools_dep_prepend(d):
|
||||
if d.getVar('INHIBIT_AUTOTOOLS_DEPS', True):
|
||||
if d.getVar('INHIBIT_AUTOTOOLS_DEPS'):
|
||||
return ''
|
||||
|
||||
pn = d.getVar('PN', True)
|
||||
pn = d.getVar('PN')
|
||||
deps = ''
|
||||
|
||||
if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
|
||||
@@ -14,7 +14,7 @@ def autotools_dep_prepend(d):
|
||||
if not bb.data.inherits_class('native', d) \
|
||||
and not bb.data.inherits_class('nativesdk', d) \
|
||||
and not bb.data.inherits_class('cross', d) \
|
||||
and not d.getVar('INHIBIT_DEFAULT_DEPS', True):
|
||||
and not d.getVar('INHIBIT_DEFAULT_DEPS'):
|
||||
deps += 'libtool-cross '
|
||||
|
||||
return deps + 'gnu-config-native '
|
||||
@@ -139,15 +139,15 @@ ACLOCALDIR = "${WORKDIR}/aclocal-copy"
|
||||
python autotools_copy_aclocals () {
|
||||
import copy
|
||||
|
||||
s = d.getVar("AUTOTOOLS_SCRIPT_PATH", True)
|
||||
s = d.getVar("AUTOTOOLS_SCRIPT_PATH")
|
||||
if not os.path.exists(s + "/configure.in") and not os.path.exists(s + "/configure.ac"):
|
||||
if not d.getVar("AUTOTOOLS_COPYACLOCAL", False):
|
||||
return
|
||||
|
||||
taskdepdata = d.getVar("BB_TASKDEPDATA", False)
|
||||
#bb.warn(str(taskdepdata))
|
||||
pn = d.getVar("PN", True)
|
||||
aclocaldir = d.getVar("ACLOCALDIR", True)
|
||||
pn = d.getVar("PN")
|
||||
aclocaldir = d.getVar("ACLOCALDIR")
|
||||
oe.path.remove(aclocaldir)
|
||||
bb.utils.mkdirhier(aclocaldir)
|
||||
start = None
|
||||
|
||||
Reference in New Issue
Block a user