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
@@ -14,19 +14,19 @@
|
||||
UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
|
||||
|
||||
python () {
|
||||
ubootmachine = d.getVar("UBOOT_MACHINE", True)
|
||||
ubootmachine = d.getVar("UBOOT_MACHINE")
|
||||
ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
|
||||
ubootbinary = d.getVar('UBOOT_BINARY', True)
|
||||
ubootbinaries = d.getVar('UBOOT_BINARIES', True)
|
||||
ubootbinary = d.getVar('UBOOT_BINARY')
|
||||
ubootbinaries = d.getVar('UBOOT_BINARIES')
|
||||
# The "doc" varflag is special, we don't want to see it here
|
||||
ubootconfigflags.pop('doc', None)
|
||||
|
||||
if not ubootmachine and not ubootconfigflags:
|
||||
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.debug(1, "To build %s, see %s for instructions on \
|
||||
setting up your machine config" % (PN, FILE))
|
||||
raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE", True))
|
||||
raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE"))
|
||||
|
||||
if ubootmachine and ubootconfigflags:
|
||||
raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.")
|
||||
@@ -37,7 +37,7 @@ python () {
|
||||
if not ubootconfigflags:
|
||||
return
|
||||
|
||||
ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split()
|
||||
ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
|
||||
if len(ubootconfig) > 0:
|
||||
for config in ubootconfig:
|
||||
for f, v in ubootconfigflags.items():
|
||||
|
||||
Reference in New Issue
Block a user