summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel-module-split.bbclass4
-rw-r--r--meta/classes/packagefeed-stability.bbclass2
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rw-r--r--meta/classes/rootfs-postcommands.bbclass4
-rw-r--r--meta/classes/testsdk.bbclass4
-rw-r--r--meta/lib/oeqa/core/utils/misc.py2
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb2
7 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 49cd8e944c..db332e57ab 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -123,7 +123,7 @@ python split_kernel_module_packages () {
123 d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) 123 d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
124 124
125 # Provide virtual package without postfix 125 # Provide virtual package without postfix
126 providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL', True) 126 providevirt = d.getVar('KERNEL_MODULE_PROVIDE_VIRTUAL')
127 if providevirt == "1": 127 if providevirt == "1":
128 postfix = format.split('%s')[1] 128 postfix = format.split('%s')[1]
129 d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, '')) 129 d.setVar('RPROVIDES_' + pkg, pkg.replace(postfix, ''))
@@ -131,7 +131,7 @@ python split_kernel_module_packages () {
131 module_regex = '^(.*)\.k?o$' 131 module_regex = '^(.*)\.k?o$'
132 132
133 module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX') 133 module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX')
134 module_pattern = module_pattern_prefix + 'kernel-module-%s-' + d.getVar("KERNEL_VERSION", True) 134 module_pattern = module_pattern_prefix + 'kernel-module-%s-' + d.getVar("KERNEL_VERSION")
135 135
136 postinst = d.getVar('pkg_postinst_modules') 136 postinst = d.getVar('pkg_postinst_modules')
137 postrm = d.getVar('pkg_postrm_modules') 137 postrm = d.getVar('pkg_postrm_modules')
diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass
index 04d2ef4ddb..c0e9be549d 100644
--- a/meta/classes/packagefeed-stability.bbclass
+++ b/meta/classes/packagefeed-stability.bbclass
@@ -232,7 +232,7 @@ python pfs_cleanpkgs () {
232 for pkgclass in (d.getVar('PACKAGE_CLASSES') or '').split(): 232 for pkgclass in (d.getVar('PACKAGE_CLASSES') or '').split():
233 if pkgclass.startswith('package_'): 233 if pkgclass.startswith('package_'):
234 pkgtype = pkgclass.split('_', 1)[1] 234 pkgtype = pkgclass.split('_', 1)[1]
235 deploydir = d.getVar('DEPLOY_DIR_%s' % pkgtype.upper(), True) 235 deploydir = d.getVar('DEPLOY_DIR_%s' % pkgtype.upper())
236 prepath = deploydir + '-prediff' 236 prepath = deploydir + '-prediff'
237 pcmanifest = os.path.join(prepath, d.expand('pkg-compare-manifest-${MULTIMACH_TARGET_SYS}-${PN}')) 237 pcmanifest = os.path.join(prepath, d.expand('pkg-compare-manifest-${MULTIMACH_TARGET_SYS}-${PN}'))
238 try: 238 try:
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 2b5aa1703c..dd3cac5d69 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -72,7 +72,7 @@ python write_target_sdk_manifest () {
72 72
73python write_sdk_test_data() { 73python write_sdk_test_data() {
74 from oe.data import export2json 74 from oe.data import export2json
75 testdata = "%s/%s.testdata.json" % (d.getVar('SDKDEPLOYDIR', True), d.getVar('TOOLCHAIN_OUTPUTNAME', True)) 75 testdata = "%s/%s.testdata.json" % (d.getVar('SDKDEPLOYDIR'), d.getVar('TOOLCHAIN_OUTPUTNAME'))
76 bb.utils.mkdirhier(os.path.dirname(testdata)) 76 bb.utils.mkdirhier(os.path.dirname(testdata))
77 export2json(d, testdata) 77 export2json(d, testdata)
78} 78}
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index c8f18c6702..65ab3ed4b3 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -308,8 +308,8 @@ rootfs_sysroot_relativelinks () {
308python write_image_test_data() { 308python write_image_test_data() {
309 from oe.data import export2json 309 from oe.data import export2json
310 310
311 testdata = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_NAME', True)) 311 testdata = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE'), d.getVar('IMAGE_NAME'))
312 testdata_link = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_LINK_NAME', True)) 312 testdata_link = "%s/%s.testdata.json" % (d.getVar('DEPLOY_DIR_IMAGE'), d.getVar('IMAGE_LINK_NAME'))
313 313
314 bb.utils.mkdirhier(os.path.dirname(testdata)) 314 bb.utils.mkdirhier(os.path.dirname(testdata))
315 export2json(d, testdata) 315 export2json(d, testdata)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 69689a1b36..75b40271fa 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -27,7 +27,7 @@ def testsdk_main(d):
27 from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor 27 from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
28 from oeqa.utils import make_logger_bitbake_compatible 28 from oeqa.utils import make_logger_bitbake_compatible
29 29
30 pn = d.getVar("PN", True) 30 pn = d.getVar("PN")
31 logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) 31 logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
32 32
33 # sdk use network for download projects for build 33 # sdk use network for download projects for build
@@ -103,7 +103,7 @@ def testsdkext_main(d):
103 from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible 103 from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible
104 from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor 104 from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor
105 105
106 pn = d.getVar("PN", True) 106 pn = d.getVar("PN")
107 logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) 107 logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
108 108
109 # extensible sdk use network 109 # extensible sdk use network
diff --git a/meta/lib/oeqa/core/utils/misc.py b/meta/lib/oeqa/core/utils/misc.py
index d1eec13aa6..0b223b5d08 100644
--- a/meta/lib/oeqa/core/utils/misc.py
+++ b/meta/lib/oeqa/core/utils/misc.py
@@ -32,7 +32,7 @@ def dataStoteToDict(d, variables):
32 data = {} 32 data = {}
33 33
34 for v in variables: 34 for v in variables:
35 data[v] = d.getVar(v, True) 35 data[v] = d.getVar(v)
36 36
37 return data 37 return data
38 38
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 f95029aed4..9edd539b55 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"
57TUNE_CCARGS_remove = "-mfpmath=sse" 57TUNE_CCARGS_remove = "-mfpmath=sse"
58 58
59python () { 59python () {
60 ccargs = d.getVar('TUNE_CCARGS', True).split() 60 ccargs = d.getVar('TUNE_CCARGS').split()
61 if '-mx32' in ccargs: 61 if '-mx32' in ccargs:
62 # use x86_64 EFI ABI 62 # use x86_64 EFI ABI
63 ccargs.remove('-mx32') 63 ccargs.remove('-mx32')