* [PATCH V2] meta: remove remaining True option to getVar calls
@ 2017-01-26 13:01 liu.ming50
0 siblings, 0 replies; 3+ messages in thread
From: liu.ming50 @ 2017-01-26 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: yue.tao, Ming Liu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 6111 bytes --]
From: Ming Liu <peter.x.liu@external.atlascopco.com>
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\)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
---
meta/classes/kernel-module-split.bbclass | 4 ++--
meta/classes/packagefeed-stability.bbclass | 2 +-
meta/classes/populate_sdk_base.bbclass | 2 +-
meta/classes/rootfs-postcommands.bbclass | 4 ++--
meta/classes/testsdk.bbclass | 4 ++--
meta/lib/oeqa/core/utils/misc.py | 2 +-
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 49cd8e9..db332e5 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -123,7 +123,7 @@ python split_kernel_module_packages () {
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
# Provide virtual package without postfix
- providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL', True)
+ providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL')
if providevirt == "1":
postfix = format.split('%s')[1]
d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, ''))
@@ -131,7 +131,7 @@ python split_kernel_module_packages () {
module_regex = '^(.*)\.k?o$'
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')
postrm = d.getVar('pkg_postrm_modules')
diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass
index 04d2ef4..c0e9be5 100644
--- a/meta/classes/packagefeed-stability.bbclass
+++ b/meta/classes/packagefeed-stability.bbclass
@@ -232,7 +232,7 @@ python pfs_cleanpkgs () {
for pkgclass in (d.getVar('PACKAGE_CLASSES') or '').split():
if pkgclass.startswith('package_'):
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'
pcmanifest = os.path.join(prepath, d.expand('pkg-compare-manifest-${MULTIMACH_TARGET_SYS}-${PN}'))
try:
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 2246eb3..22b577e 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -72,7 +72,7 @@ python write_target_sdk_manifest () {
python write_sdk_test_data() {
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))
export2json(d, testdata)
}
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index c8f18c6..65ab3ed 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -308,8 +308,8 @@ rootfs_sysroot_relativelinks () {
python write_image_test_data() {
from oe.data import export2json
- testdata = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_NAME', True))
- testdata_link = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_LINK_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'), d.getVar('IMAGE_LINK_NAME'))
bb.utils.mkdirhier(os.path.dirname(testdata))
export2json(d, testdata)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 69689a1..75b4027 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -27,7 +27,7 @@ def testsdk_main(d):
from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
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"))
# 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.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor
- pn = d.getVar("PN", True)
+ pn = d.getVar("PN")
logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
# extensible sdk use network
diff --git a/meta/lib/oeqa/core/utils/misc.py b/meta/lib/oeqa/core/utils/misc.py
index 6ae58ad..6779b36 100644
--- a/meta/lib/oeqa/core/utils/misc.py
+++ b/meta/lib/oeqa/core/utils/misc.py
@@ -32,6 +32,6 @@ def dataStoteToDict(d, variables):
data = {}
for v in variables:
- data[v] = d.getVar(v, True)
+ data[v] = d.getVar(v)
return data
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
index f95029a..9edd539 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
@@ -57,7 +57,7 @@ BBCLASSEXTEND = "native"
TUNE_CCARGS_remove = "-mfpmath=sse"
python () {
- ccargs = d.getVar('TUNE_CCARGS', True).split()
+ ccargs = d.getVar('TUNE_CCARGS').split()
if '-mx32' in ccargs:
# use x86_64 EFI ABI
ccargs.remove('-mx32')
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH V2] meta: remove remaining True option to getVar calls
@ 2017-01-26 13:26 liu.ming50
2017-01-26 13:26 ` [PATCH] " liu.ming50
0 siblings, 1 reply; 3+ messages in thread
From: liu.ming50 @ 2017-01-26 13:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Ming Liu
From: Ming Liu <liu.ming50@gmail.com>
This is the V2 set of this patch, please ignore the origninal one, I had
some charset issues on my computer, so the patch was messed up, sorry for
the disturbing.
Ming Liu (1):
meta: remove remaining True option to getVar calls
meta/classes/kernel-module-split.bbclass | 4 ++--
meta/classes/packagefeed-stability.bbclass | 2 +-
meta/classes/populate_sdk_base.bbclass | 2 +-
meta/classes/rootfs-postcommands.bbclass | 4 ++--
meta/classes/testsdk.bbclass | 4 ++--
meta/lib/oeqa/core/utils/misc.py | 2 +-
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] meta: remove remaining True option to getVar calls
2017-01-26 13:26 [PATCH V2] meta: remove remaining True option to getVar calls liu.ming50
@ 2017-01-26 13:26 ` liu.ming50
0 siblings, 0 replies; 3+ messages in thread
From: liu.ming50 @ 2017-01-26 13:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Ming Liu
From: Ming Liu <peter.x.liu@external.atlascopco.com>
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\)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
---
meta/classes/kernel-module-split.bbclass | 4 ++--
meta/classes/packagefeed-stability.bbclass | 2 +-
meta/classes/populate_sdk_base.bbclass | 2 +-
meta/classes/rootfs-postcommands.bbclass | 4 ++--
meta/classes/testsdk.bbclass | 4 ++--
meta/lib/oeqa/core/utils/misc.py | 2 +-
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 49cd8e9..db332e5 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -123,7 +123,7 @@ python split_kernel_module_packages () {
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
# Provide virtual package without postfix
- providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL', True)
+ providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL')
if providevirt == "1":
postfix = format.split('%s')[1]
d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, ''))
@@ -131,7 +131,7 @@ python split_kernel_module_packages () {
module_regex = '^(.*)\.k?o$'
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')
postrm = d.getVar('pkg_postrm_modules')
diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass
index 04d2ef4..c0e9be5 100644
--- a/meta/classes/packagefeed-stability.bbclass
+++ b/meta/classes/packagefeed-stability.bbclass
@@ -232,7 +232,7 @@ python pfs_cleanpkgs () {
for pkgclass in (d.getVar('PACKAGE_CLASSES') or '').split():
if pkgclass.startswith('package_'):
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'
pcmanifest = os.path.join(prepath, d.expand('pkg-compare-manifest-${MULTIMACH_TARGET_SYS}-${PN}'))
try:
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 2246eb3..22b577e 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -72,7 +72,7 @@ python write_target_sdk_manifest () {
python write_sdk_test_data() {
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))
export2json(d, testdata)
}
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index c8f18c6..65ab3ed 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -308,8 +308,8 @@ rootfs_sysroot_relativelinks () {
python write_image_test_data() {
from oe.data import export2json
- testdata = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_NAME', True))
- testdata_link = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_LINK_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'), d.getVar('IMAGE_LINK_NAME'))
bb.utils.mkdirhier(os.path.dirname(testdata))
export2json(d, testdata)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 69689a1..75b4027 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -27,7 +27,7 @@ def testsdk_main(d):
from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
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"))
# 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.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor
- pn = d.getVar("PN", True)
+ pn = d.getVar("PN")
logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
# extensible sdk use network
diff --git a/meta/lib/oeqa/core/utils/misc.py b/meta/lib/oeqa/core/utils/misc.py
index 6ae58ad..6779b36 100644
--- a/meta/lib/oeqa/core/utils/misc.py
+++ b/meta/lib/oeqa/core/utils/misc.py
@@ -32,6 +32,6 @@ def dataStoteToDict(d, variables):
data = {}
for v in variables:
- data[v] = d.getVar(v, True)
+ data[v] = d.getVar(v)
return data
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
index f95029a..9edd539 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
@@ -57,7 +57,7 @@ BBCLASSEXTEND = "native"
TUNE_CCARGS_remove = "-mfpmath=sse"
python () {
- ccargs = d.getVar('TUNE_CCARGS', True).split()
+ ccargs = d.getVar('TUNE_CCARGS').split()
if '-mx32' in ccargs:
# use x86_64 EFI ABI
ccargs.remove('-mx32')
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-26 13:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-26 13:26 [PATCH V2] meta: remove remaining True option to getVar calls liu.ming50
2017-01-26 13:26 ` [PATCH] " liu.ming50
-- strict thread matches above, loose matches on Subject: below --
2017-01-26 13:01 [PATCH V2] " liu.ming50
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox