mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +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
@@ -16,15 +16,15 @@ PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}"
|
||||
|
||||
LICENSE ?= "MIT"
|
||||
|
||||
inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'allarch', '')}
|
||||
inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED') == 'all', 'allarch', '')}
|
||||
|
||||
# This automatically adds -dbg and -dev flavours of all PACKAGES
|
||||
# to the list. Their dependencies (RRECOMMENDS) are handled as usual
|
||||
# by package_depchains in a following step.
|
||||
# Also mark all packages as ALLOW_EMPTY
|
||||
python () {
|
||||
packages = d.getVar('PACKAGES', True).split()
|
||||
if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
|
||||
packages = d.getVar('PACKAGES').split()
|
||||
if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY') != '1':
|
||||
types = ['', '-dbg', '-dev']
|
||||
if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d):
|
||||
types.append('-ptest')
|
||||
@@ -49,7 +49,7 @@ do_install[noexec] = "1"
|
||||
do_populate_sysroot[noexec] = "1"
|
||||
|
||||
python () {
|
||||
initman = d.getVar("VIRTUAL-RUNTIME_init_manager", True)
|
||||
initman = d.getVar("VIRTUAL-RUNTIME_init_manager")
|
||||
if initman and initman in ['sysvinit', 'systemd'] and not bb.utils.contains('DISTRO_FEATURES', initman, True, False, d):
|
||||
bb.fatal("Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (%s) matches the entries enabled in DISTRO_FEATURES" % initman)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user