mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 15:49:32 +02: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
@@ -15,7 +15,7 @@ require conf/distro/include/uninative-flags.inc
|
||||
TCLIBCAPPEND ?= "-${TCLIBC}"
|
||||
TMPDIR .= "${TCLIBCAPPEND}"
|
||||
|
||||
CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE', True))][bool(d.getVar('MACHINE', True))]}${@['', '/' + str(d.getVar('SDKMACHINE', True))][bool(d.getVar('SDKMACHINE', True))]}"
|
||||
CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
|
||||
|
||||
USER_CLASSES ?= ""
|
||||
PACKAGE_CLASSES ?= "package_ipk"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# glibc specific configuration
|
||||
#
|
||||
|
||||
LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
|
||||
LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}"
|
||||
|
||||
# Add glibc overrides to the overrides for glibc.
|
||||
LIBCOVERRIDE = ":libc-glibc"
|
||||
@@ -34,7 +34,7 @@ LIBC_LOCALE_DEPENDENCIES = "\
|
||||
glibc-gconv-iso8859-15"
|
||||
|
||||
def get_libc_locales_dependencies(d):
|
||||
if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :
|
||||
return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or ''
|
||||
if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() :
|
||||
return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
|
||||
else:
|
||||
return ''
|
||||
|
||||
Reference in New Issue
Block a user