meta: remove remaining True option to getVar calls
This is a complementary fix to commit 7c552996: [ meta: remove True option to getVar calls ] it intended to remove all True option to getVar calls, but there are still some remaining. Search made with the following regex: getVar ?\((.*), True\) (From OE-Core rev: 87d03ffe03d6f01e360bfd51714be96e62506e0a) Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8b448ab012
commit
e2280b9e12
|
@ -123,7 +123,7 @@ python split_kernel_module_packages () {
|
||||||
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
|
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
|
||||||
|
|
||||||
# Provide virtual package without postfix
|
# Provide virtual package without postfix
|
||||||
providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL', True)
|
providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL')
|
||||||
if providevirt == "1":
|
if providevirt == "1":
|
||||||
postfix = format.split('%s')[1]
|
postfix = format.split('%s')[1]
|
||||||
d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, ''))
|
d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, ''))
|
||||||
|
@ -131,7 +131,7 @@ python split_kernel_module_packages () {
|
||||||
module_regex = '^(.*)\.k?o$'
|
module_regex = '^(.*)\.k?o$'
|
||||||
|
|
||||||
module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX')
|
module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX')
|
||||||
module_pattern = module_pattern_prefix + 'kernel-module-%s-' + d.getVar("KERNEL_VERSION", True)
|
module_pattern = module_pattern_prefix + 'kernel-module-%s-' + d.getVar("KERNEL_VERSION")
|
||||||
|
|
||||||
postinst = d.getVar('pkg_postinst_modules')
|
postinst = d.getVar('pkg_postinst_modules')
|
||||||
postrm = d.getVar('pkg_postrm_modules')
|
postrm = d.getVar('pkg_postrm_modules')
|
||||||
|
|
|
@ -232,7 +232,7 @@ python pfs_cleanpkgs () {
|
||||||
for pkgclass in (d.getVar('PACKAGE_CLASSES') or '').split():
|
for pkgclass in (d.getVar('PACKAGE_CLASSES') or '').split():
|
||||||
if pkgclass.startswith('package_'):
|
if pkgclass.startswith('package_'):
|
||||||
pkgtype = pkgclass.split('_', 1)[1]
|
pkgtype = pkgclass.split('_', 1)[1]
|
||||||
deploydir = d.getVar('DEPLOY_DIR_%s' % pkgtype.upper(), True)
|
deploydir = d.getVar('DEPLOY_DIR_%s' % pkgtype.upper())
|
||||||
prepath = deploydir + '-prediff'
|
prepath = deploydir + '-prediff'
|
||||||
pcmanifest = os.path.join(prepath, d.expand('pkg-compare-manifest-${MULTIMACH_TARGET_SYS}-${PN}'))
|
pcmanifest = os.path.join(prepath, d.expand('pkg-compare-manifest-${MULTIMACH_TARGET_SYS}-${PN}'))
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -72,7 +72,7 @@ python write_target_sdk_manifest () {
|
||||||
|
|
||||||
python write_sdk_test_data() {
|
python write_sdk_test_data() {
|
||||||
from oe.data import export2json
|
from oe.data import export2json
|
||||||
testdata = "%s/%s.testdata.json" % (d.getVar('SDKDEPLOYDIR', True), d.getVar('TOOLCHAIN_OUTPUTNAME', True))
|
testdata = "%s/%s.testdata.json" % (d.getVar('SDKDEPLOYDIR'), d.getVar('TOOLCHAIN_OUTPUTNAME'))
|
||||||
bb.utils.mkdirhier(os.path.dirname(testdata))
|
bb.utils.mkdirhier(os.path.dirname(testdata))
|
||||||
export2json(d, testdata)
|
export2json(d, testdata)
|
||||||
}
|
}
|
||||||
|
|
|
@ -308,8 +308,8 @@ rootfs_sysroot_relativelinks () {
|
||||||
python write_image_test_data() {
|
python write_image_test_data() {
|
||||||
from oe.data import export2json
|
from oe.data import export2json
|
||||||
|
|
||||||
testdata = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_NAME', True))
|
testdata = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE'), d.getVar('IMAGE_NAME'))
|
||||||
testdata_link = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_LINK_NAME', True))
|
testdata_link = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE'), d.getVar('IMAGE_LINK_NAME'))
|
||||||
|
|
||||||
bb.utils.mkdirhier(os.path.dirname(testdata))
|
bb.utils.mkdirhier(os.path.dirname(testdata))
|
||||||
export2json(d, testdata)
|
export2json(d, testdata)
|
||||||
|
|
|
@ -27,7 +27,7 @@ def testsdk_main(d):
|
||||||
from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
|
from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
|
||||||
from oeqa.utils import make_logger_bitbake_compatible
|
from oeqa.utils import make_logger_bitbake_compatible
|
||||||
|
|
||||||
pn = d.getVar("PN", True)
|
pn = d.getVar("PN")
|
||||||
logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
|
logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
|
||||||
|
|
||||||
# sdk use network for download projects for build
|
# sdk use network for download projects for build
|
||||||
|
@ -103,7 +103,7 @@ def testsdkext_main(d):
|
||||||
from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible
|
from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible
|
||||||
from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor
|
from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor
|
||||||
|
|
||||||
pn = d.getVar("PN", True)
|
pn = d.getVar("PN")
|
||||||
logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
|
logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
|
||||||
|
|
||||||
# extensible sdk use network
|
# extensible sdk use network
|
||||||
|
|
|
@ -32,7 +32,7 @@ def dataStoteToDict(d, variables):
|
||||||
data = {}
|
data = {}
|
||||||
|
|
||||||
for v in variables:
|
for v in variables:
|
||||||
data[v] = d.getVar(v, True)
|
data[v] = d.getVar(v)
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ BBCLASSEXTEND = "native"
|
||||||
TUNE_CCARGS_remove = "-mfpmath=sse"
|
TUNE_CCARGS_remove = "-mfpmath=sse"
|
||||||
|
|
||||||
python () {
|
python () {
|
||||||
ccargs = d.getVar('TUNE_CCARGS', True).split()
|
ccargs = d.getVar('TUNE_CCARGS').split()
|
||||||
if '-mx32' in ccargs:
|
if '-mx32' in ccargs:
|
||||||
# use x86_64 EFI ABI
|
# use x86_64 EFI ABI
|
||||||
ccargs.remove('-mx32')
|
ccargs.remove('-mx32')
|
||||||
|
|
Loading…
Reference in New Issue