summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-05 21:15:08 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-09 13:39:11 (GMT)
commit022a8b58c862a1db68c2dcddc908317e5d61d92e (patch)
tree55fbd06754d21b0cad93128e0c912acc2638a959 /meta
parente016eb10b075e280b4e78a04e47b59a173386421 (diff)
downloadpoky-022a8b58c862a1db68c2dcddc908317e5d61d92e.tar.gz
meta/scripts: Various getVar/getVarFlag expansion parameter fixes
There were a few straggling expansion parameter removals left for getVar/getVarFlag where the odd whitespace meant they were missed on previous passes. There were also some plain broken ussages such as: d.getVar('ALTERNATIVE_TARGET', old_name, True) path = d.getVar('PATH', d, True) d.getVar('IMAGE_ROOTFS', 'True') which I've corrected (they happend to work by luck). (From OE-Core rev: 688f7a64917a5ce5cbe12f8e5da4d47e265d240f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/blacklist.bbclass2
-rw-r--r--meta/classes/bugzilla.bbclass4
-rw-r--r--meta/classes/cml1.bbclass2
-rw-r--r--meta/classes/compress_doc.bbclass2
-rw-r--r--meta/classes/gummiboot.bbclass14
-rw-r--r--meta/classes/insane.bbclass4
-rw-r--r--meta/classes/kernel-yocto.bbclass6
-rw-r--r--meta/classes/license.bbclass4
-rw-r--r--meta/classes/multilib.bbclass2
-rw-r--r--meta/classes/package.bbclass4
-rw-r--r--meta/classes/packagefeed-stability.bbclass2
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/classes/qemu.bbclass2
-rw-r--r--meta/classes/sanity.bbclass4
-rw-r--r--meta/classes/systemd.bbclass2
-rw-r--r--meta/classes/tinderclient.bbclass28
-rw-r--r--meta/classes/uninative.bbclass2
-rw-r--r--meta/classes/utils.bbclass2
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/multilib.conf2
-rw-r--r--meta/lib/oe/package_manager.py6
-rw-r--r--meta/lib/oe/utils.py2
-rw-r--r--meta/lib/oeqa/runtime/_ptest.py2
-rw-r--r--meta/recipes-core/glibc/glibc-ld.inc2
-rw-r--r--meta/recipes-core/meta/meta-environment-extsdk.bb2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc2
-rw-r--r--meta/recipes-support/attr/ea-acl.inc4
27 files changed, 55 insertions, 57 deletions
diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass
index 6513819..3413a5b 100644
--- a/meta/classes/blacklist.bbclass
+++ b/meta/classes/blacklist.bbclass
@@ -38,7 +38,7 @@ python blacklist_multilib_eventhandler() {
38} 38}
39 39
40python () { 40python () {
41 blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN'), True) 41 blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN'))
42 42
43 if blacklist: 43 if blacklist:
44 raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist)) 44 raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist))
diff --git a/meta/classes/bugzilla.bbclass b/meta/classes/bugzilla.bbclass
index 6d9a821..8909c27 100644
--- a/meta/classes/bugzilla.bbclass
+++ b/meta/classes/bugzilla.bbclass
@@ -117,7 +117,7 @@ python bugzilla_eventhandler() {
117 compon = data.getVar("BUGZILLA_COMPONENT") 117 compon = data.getVar("BUGZILLA_COMPONENT")
118 version = data.getVar("BUGZILLA_VERSION") 118 version = data.getVar("BUGZILLA_VERSION")
119 119
120 proxy = data.getVar('http_proxy', True ) 120 proxy = data.getVar('http_proxy')
121 if (proxy): 121 if (proxy):
122 import urllib2 122 import urllib2
123 s, u, p, hostport = urllib2._parse_proxy(proxy) 123 s, u, p, hostport = urllib2._parse_proxy(proxy)
@@ -140,7 +140,7 @@ python bugzilla_eventhandler() {
140 "pv" : data.getVar("PV"), 140 "pv" : data.getVar("PV"),
141 } 141 }
142 log_file = glob.glob("%s/log.%s.*" % (event.data.getVar('T'), event.task)) 142 log_file = glob.glob("%s/log.%s.*" % (event.data.getVar('T'), event.task))
143 text = "The %s step in %s failed at %s for machine %s" % (e.task, data.getVar("PN"), data.getVar('DATETIME'), data.getVar( 'MACHINE', True ) ) 143 text = "The %s step in %s failed at %s for machine %s" % (e.task, data.getVar("PN"), data.getVar('DATETIME'), data.getVar('MACHINE') )
144 if len(log_file) != 0: 144 if len(log_file) != 0:
145 print >> debug_file, "Adding log file %s" % log_file[0] 145 print >> debug_file, "Adding log file %s" % log_file[0]
146 file = open(log_file[0], 'r') 146 file = open(log_file[0], 'r')
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 187d407..38e6613 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -27,7 +27,7 @@ python do_menuconfig() {
27 mtime = 0 27 mtime = 0
28 28
29 oe_terminal("${SHELL} -c \"make %s; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'), 29 oe_terminal("${SHELL} -c \"make %s; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'),
30 d.getVar('PN', True ) + ' Configuration', d) 30 d.getVar('PN') + ' Configuration', d)
31 31
32 # FIXME this check can be removed when the minimum bitbake version has been bumped 32 # FIXME this check can be removed when the minimum bitbake version has been bumped
33 if hasattr(bb.build, 'write_taint'): 33 if hasattr(bb.build, 'write_taint'):
diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass
index ba97721..069d534 100644
--- a/meta/classes/compress_doc.bbclass
+++ b/meta/classes/compress_doc.bbclass
@@ -249,7 +249,7 @@ python compress_doc_updatealternatives () {
249 d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target) 249 d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target)
250 elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg): 250 elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg):
251 d.setVar('ALTERNATIVE_TARGET_%s' % pkg, new_target) 251 d.setVar('ALTERNATIVE_TARGET_%s' % pkg, new_target)
252 elif d.getVar('ALTERNATIVE_TARGET', old_name, True): 252 elif d.getVar('ALTERNATIVE_TARGET'):
253 d.setVar('ALTERNATIVE_TARGET', new_target) 253 d.setVar('ALTERNATIVE_TARGET', new_target)
254 254
255 new_names.append(new_name) 255 new_names.append(new_name)
diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass
index 4f2dea6..5aaf766 100644
--- a/meta/classes/gummiboot.bbclass
+++ b/meta/classes/gummiboot.bbclass
@@ -60,8 +60,8 @@ efi_hddimg_populate() {
60} 60}
61 61
62python build_efi_cfg() { 62python build_efi_cfg() {
63 s = d.getVar("S", True) 63 s = d.getVar("S")
64 labels = d.getVar('LABELS', True) 64 labels = d.getVar('LABELS')
65 if not labels: 65 if not labels:
66 bb.debug(1, "LABELS not defined, nothing to do") 66 bb.debug(1, "LABELS not defined, nothing to do")
67 return 67 return
@@ -70,7 +70,7 @@ python build_efi_cfg() {
70 bb.debug(1, "No labels, nothing to do") 70 bb.debug(1, "No labels, nothing to do")
71 return 71 return
72 72
73 cfile = d.getVar('GUMMIBOOT_CFG', True) 73 cfile = d.getVar('GUMMIBOOT_CFG')
74 try: 74 try:
75 cfgfile = open(cfile, 'w') 75 cfgfile = open(cfile, 'w')
76 except OSError: 76 except OSError:
@@ -78,7 +78,7 @@ python build_efi_cfg() {
78 78
79 cfgfile.write('# Automatically created by OE\n') 79 cfgfile.write('# Automatically created by OE\n')
80 cfgfile.write('default %s\n' % (labels.split()[0])) 80 cfgfile.write('default %s\n' % (labels.split()[0]))
81 timeout = d.getVar('GUMMIBOOT_TIMEOUT', True) 81 timeout = d.getVar('GUMMIBOOT_TIMEOUT')
82 if timeout: 82 if timeout:
83 cfgfile.write('timeout %s\n' % timeout) 83 cfgfile.write('timeout %s\n' % timeout)
84 else: 84 else:
@@ -88,7 +88,7 @@ python build_efi_cfg() {
88 for label in labels.split(): 88 for label in labels.split():
89 localdata = d.createCopy() 89 localdata = d.createCopy()
90 90
91 overrides = localdata.getVar('OVERRIDES', True) 91 overrides = localdata.getVar('OVERRIDES')
92 if not overrides: 92 if not overrides:
93 bb.fatal('OVERRIDES not defined') 93 bb.fatal('OVERRIDES not defined')
94 94
@@ -104,8 +104,8 @@ python build_efi_cfg() {
104 entrycfg.write('title %s\n' % label) 104 entrycfg.write('title %s\n' % label)
105 entrycfg.write('linux /vmlinuz\n') 105 entrycfg.write('linux /vmlinuz\n')
106 106
107 append = localdata.getVar('APPEND', True) 107 append = localdata.getVar('APPEND')
108 initrd = localdata.getVar('INITRD', True) 108 initrd = localdata.getVar('INITRD')
109 109
110 if initrd: 110 if initrd:
111 entrycfg.write('initrd /initrd\n') 111 entrycfg.write('initrd /initrd\n')
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index f8f6e00..632821c 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -336,7 +336,7 @@ def package_qa_check_libdir(d):
336 import re 336 import re
337 337
338 pkgdest = d.getVar('PKGDEST') 338 pkgdest = d.getVar('PKGDEST')
339 base_libdir = d.getVar("base_libdir",True) + os.sep 339 base_libdir = d.getVar("base_libdir") + os.sep
340 libdir = d.getVar("libdir") + os.sep 340 libdir = d.getVar("libdir") + os.sep
341 libexecdir = d.getVar("libexecdir") + os.sep 341 libexecdir = d.getVar("libexecdir") + os.sep
342 exec_prefix = d.getVar("exec_prefix") + os.sep 342 exec_prefix = d.getVar("exec_prefix") + os.sep
@@ -568,7 +568,7 @@ def package_qa_check_desktop(path, name, d, elf, messages):
568 Run all desktop files through desktop-file-validate. 568 Run all desktop files through desktop-file-validate.
569 """ 569 """
570 if path.endswith(".desktop"): 570 if path.endswith(".desktop"):
571 desktop_file_validate = os.path.join(d.getVar('STAGING_BINDIR_NATIVE',True),'desktop-file-validate') 571 desktop_file_validate = os.path.join(d.getVar('STAGING_BINDIR_NATIVE'),'desktop-file-validate')
572 output = os.popen("%s %s" % (desktop_file_validate, path)) 572 output = os.popen("%s %s" % (desktop_file_validate, path))
573 # This only produces output on errors 573 # This only produces output on errors
574 for l in output: 574 for l in output:
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index c7fff5a..5cfd8aff 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -286,7 +286,7 @@ python do_kernel_configcheck() {
286 # if KMETA isn't set globally by a recipe using this routine, we need to 286 # if KMETA isn't set globally by a recipe using this routine, we need to
287 # set the default to 'meta'. Otherwise, kconf_check is not passed a valid 287 # set the default to 'meta'. Otherwise, kconf_check is not passed a valid
288 # meta-series for processing 288 # meta-series for processing
289 kmeta = d.getVar( "KMETA", True ) or "meta" 289 kmeta = d.getVar("KMETA") or "meta"
290 if not os.path.exists(kmeta): 290 if not os.path.exists(kmeta):
291 kmeta = "." + kmeta 291 kmeta = "." + kmeta
292 292
@@ -298,8 +298,8 @@ python do_kernel_configcheck() {
298 cmd = d.expand("cd ${S}; kconf_check --report -o ${S}/%s/cfg/ ${B}/.config ${S} %s" % (kmeta,configs)) 298 cmd = d.expand("cd ${S}; kconf_check --report -o ${S}/%s/cfg/ ${B}/.config ${S} %s" % (kmeta,configs))
299 ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) 299 ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd))
300 300
301 config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) 301 config_check_visibility = int(d.getVar("KCONF_AUDIT_LEVEL") or 0)
302 bsp_check_visibility = int(d.getVar( "KCONF_BSP_AUDIT_LEVEL", True ) or 0) 302 bsp_check_visibility = int(d.getVar("KCONF_BSP_AUDIT_LEVEL") or 0)
303 303
304 # if config check visibility is non-zero, report dropped configuration values 304 # if config check visibility is non-zero, report dropped configuration values
305 mismatch_file = d.expand("${S}/%s/cfg/mismatch.txt" % kmeta) 305 mismatch_file = d.expand("${S}/%s/cfg/mismatch.txt" % kmeta)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 009ee4a..44467d0 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -117,7 +117,7 @@ def write_license_files(d, license_manifest, pkg_dic):
117 copy_lic_manifest = d.getVar('COPY_LIC_MANIFEST') 117 copy_lic_manifest = d.getVar('COPY_LIC_MANIFEST')
118 copy_lic_dirs = d.getVar('COPY_LIC_DIRS') 118 copy_lic_dirs = d.getVar('COPY_LIC_DIRS')
119 if copy_lic_manifest == "1": 119 if copy_lic_manifest == "1":
120 rootfs_license_dir = os.path.join(d.getVar('IMAGE_ROOTFS', 'True'), 120 rootfs_license_dir = os.path.join(d.getVar('IMAGE_ROOTFS'),
121 'usr', 'share', 'common-licenses') 121 'usr', 'share', 'common-licenses')
122 bb.utils.mkdirhier(rootfs_license_dir) 122 bb.utils.mkdirhier(rootfs_license_dir)
123 rootfs_license_manifest = os.path.join(rootfs_license_dir, 123 rootfs_license_manifest = os.path.join(rootfs_license_dir,
@@ -516,7 +516,7 @@ def canonical_license(d, license):
516 """ 516 """
517 lic = d.getVarFlag('SPDXLICENSEMAP', license) or "" 517 lic = d.getVarFlag('SPDXLICENSEMAP', license) or ""
518 if not lic and license.endswith('+'): 518 if not lic and license.endswith('+'):
519 lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'), True) 519 lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'))
520 if lic: 520 if lic:
521 lic += '+' 521 lic += '+'
522 return lic or license 522 return lic or license
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 498f7f5..a4f70f2 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -119,7 +119,7 @@ PACKAGEFUNCS_append = " do_package_qa_multilib"
119python do_package_qa_multilib() { 119python do_package_qa_multilib() {
120 120
121 def check_mlprefix(pkg, var, mlprefix): 121 def check_mlprefix(pkg, var, mlprefix):
122 values = bb.utils.explode_deps(d.getVar('%s_%s' % (var, pkg), True) or d.getVar(var) or "") 122 values = bb.utils.explode_deps(d.getVar('%s_%s' % (var, pkg)) or d.getVar(var) or "")
123 candidates = [] 123 candidates = []
124 for i in values: 124 for i in values:
125 if i.startswith('virtual/'): 125 if i.startswith('virtual/'):
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e177e77..568b85c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1286,11 +1286,11 @@ python emit_pkgdata() {
1286 c = codecs.getencoder("unicode_escape") 1286 c = codecs.getencoder("unicode_escape")
1287 return c(str)[0].decode("latin1") 1287 return c(str)[0].decode("latin1")
1288 1288
1289 val = d.getVar('%s_%s' % (var, pkg), True) 1289 val = d.getVar('%s_%s' % (var, pkg))
1290 if val: 1290 if val:
1291 f.write('%s_%s: %s\n' % (var, pkg, encode(val))) 1291 f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
1292 return val 1292 return val
1293 val = d.getVar('%s' % (var), True) 1293 val = d.getVar('%s' % (var))
1294 if val: 1294 if val:
1295 f.write('%s: %s\n' % (var, encode(val))) 1295 f.write('%s: %s\n' % (var, encode(val)))
1296 return val 1296 return val
diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass
index f30dc70..04d2ef4 100644
--- a/meta/classes/packagefeed-stability.bbclass
+++ b/meta/classes/packagefeed-stability.bbclass
@@ -84,7 +84,7 @@ def package_compare_impl(pkgtype, d):
84 import oe.sstatesig 84 import oe.sstatesig
85 85
86 pn = d.getVar('PN') 86 pn = d.getVar('PN')
87 deploydir = d.getVar('DEPLOY_DIR_%s' % pkgtype.upper(), True) 87 deploydir = d.getVar('DEPLOY_DIR_%s' % pkgtype.upper())
88 prepath = deploydir + '-prediff/' 88 prepath = deploydir + '-prediff/'
89 89
90 # Find out PKGR values are 90 # Find out PKGR values are
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index d1b3fb4..f21ae8b 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -512,7 +512,7 @@ install_tools() {
512 # (they get populated from sstate on installation) 512 # (they get populated from sstate on installation)
513 unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd" 513 unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd"
514 if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; then 514 if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; then
515 binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE',True), d.getVar('TOPDIR'))} 515 binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE'), d.getVar('TOPDIR'))}
516 lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd $unfsd_path 516 lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd $unfsd_path
517 fi 517 fi
518 touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase 518 touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 6167582..f5c5780 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -52,7 +52,7 @@ def qemu_run_binary(data, rootfs_path, binary):
52# this dance). For others (e.g. arm) a -cpu option is not necessary, since the 52# this dance). For others (e.g. arm) a -cpu option is not necessary, since the
53# qemu-arm default CPU supports all required architecture levels. 53# qemu-arm default CPU supports all required architecture levels.
54 54
55QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH'), True) or ""}" 55QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')) or ""}"
56QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}" 56QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
57 57
58QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2" 58QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 9674ae9..c876dc6 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -199,7 +199,7 @@ def check_toolchain_tune_args(data, tune, multilib, errs):
199 199
200def check_toolchain_args_present(data, tune, multilib, tune_errors, which): 200def check_toolchain_args_present(data, tune, multilib, tune_errors, which):
201 args_set = (data.getVar("TUNE_%s" % which) or "").split() 201 args_set = (data.getVar("TUNE_%s" % which) or "").split()
202 args_wanted = (data.getVar("TUNEABI_REQUIRED_%s_tune-%s" % (which, tune), True) or "").split() 202 args_wanted = (data.getVar("TUNEABI_REQUIRED_%s_tune-%s" % (which, tune)) or "").split()
203 args_missing = [] 203 args_missing = []
204 204
205 # If no args are listed/required, we are done. 205 # If no args are listed/required, we are done.
@@ -455,7 +455,7 @@ def check_gcc_march(sanity_data):
455 message = "" 455 message = ""
456 456
457 # Check if -march not in BUILD_CFLAGS 457 # Check if -march not in BUILD_CFLAGS
458 if sanity_data.getVar("BUILD_CFLAGS",True).find("-march") < 0: 458 if sanity_data.getVar("BUILD_CFLAGS").find("-march") < 0:
459 result = False 459 result = False
460 460
461 # Construct a test file 461 # Construct a test file
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 34bfefa..0b1c228 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -69,7 +69,7 @@ python systemd_populate_packages() {
69 return 69 return
70 70
71 def get_package_var(d, var, pkg): 71 def get_package_var(d, var, pkg):
72 val = (d.getVar('%s_%s' % (var, pkg), True) or "").strip() 72 val = (d.getVar('%s_%s' % (var, pkg)) or "").strip()
73 if val == "": 73 if val == "":
74 val = (d.getVar(var) or "").strip() 74 val = (d.getVar(var) or "").strip()
75 return val 75 return val
diff --git a/meta/classes/tinderclient.bbclass b/meta/classes/tinderclient.bbclass
index 706a392..00f453c 100644
--- a/meta/classes/tinderclient.bbclass
+++ b/meta/classes/tinderclient.bbclass
@@ -82,7 +82,7 @@ def tinder_format_http_post(d,status,log):
82 # we only need on build_status.pl but sending it 82 # we only need on build_status.pl but sending it
83 # always does not hurt 83 # always does not hurt
84 try: 84 try:
85 f = open(d.getVar('TMPDIR',True)+'/tinder-machine.id', 'r') 85 f = open(d.getVar('TMPDIR')+'/tinder-machine.id', 'r')
86 id = f.read() 86 id = f.read()
87 variables['machine_id'] = id 87 variables['machine_id'] = id
88 except: 88 except:
@@ -106,8 +106,8 @@ def tinder_build_start(d):
106 106
107 # get the body and type 107 # get the body and type
108 content_type, body = tinder_format_http_post(d,None,None) 108 content_type, body = tinder_format_http_post(d,None,None)
109 server = d.getVar('TINDER_HOST', True ) 109 server = d.getVar('TINDER_HOST')
110 url = d.getVar('TINDER_URL', True ) 110 url = d.getVar('TINDER_URL')
111 111
112 selector = url + "/xml/build_start.pl" 112 selector = url + "/xml/build_start.pl"
113 113
@@ -163,16 +163,16 @@ def tinder_print_info(d):
163 time = tinder_time_string() 163 time = tinder_time_string()
164 ops = os.uname()[0] 164 ops = os.uname()[0]
165 version = os.uname()[2] 165 version = os.uname()[2]
166 url = d.getVar( 'TINDER_URL' , True ) 166 url = d.getVar('TINDER_URL')
167 tree = d.getVar( 'TINDER_TREE', True ) 167 tree = d.getVar('TINDER_TREE')
168 branch = d.getVar( 'TINDER_BRANCH', True ) 168 branch = d.getVar('TINDER_BRANCH')
169 srcdate = d.getVar( 'SRCDATE', True ) 169 srcdate = d.getVar('SRCDATE')
170 machine = d.getVar( 'MACHINE', True ) 170 machine = d.getVar('MACHINE')
171 distro = d.getVar( 'DISTRO', True ) 171 distro = d.getVar('DISTRO')
172 bbfiles = d.getVar( 'BBFILES', True ) 172 bbfiles = d.getVar('BBFILES')
173 tarch = d.getVar( 'TARGET_ARCH', True ) 173 tarch = d.getVar('TARGET_ARCH')
174 fpu = d.getVar( 'TARGET_FPU', True ) 174 fpu = d.getVar('TARGET_FPU')
175 oerev = d.getVar( 'OE_REVISION', True ) or "unknown" 175 oerev = d.getVar('OE_REVISION') or "unknown"
176 176
177 # there is a bug with tipple quoted strings 177 # there is a bug with tipple quoted strings
178 # i will work around but will fix the original 178 # i will work around but will fix the original
@@ -326,7 +326,7 @@ def tinder_do_tinder_report(event):
326 status = 100 326 status = 100
327 # Check if we have a old status... 327 # Check if we have a old status...
328 try: 328 try:
329 h = open(event.data.getVar('TMPDIR',True)+'/tinder-status', 'r') 329 h = open(event.data.getVar('TMPDIR')+'/tinder-status', 'r')
330 status = int(h.read()) 330 status = int(h.read())
331 except: 331 except:
332 pass 332 pass
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 03ad5d6..54f63af 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -20,7 +20,7 @@ python uninative_event_fetchloader() {
20 loader isn't already present. 20 loader isn't already present.
21 """ 21 """
22 22
23 chksum = d.getVarFlag("UNINATIVE_CHECKSUM", d.getVar("BUILD_ARCH"), True) 23 chksum = d.getVarFlag("UNINATIVE_CHECKSUM", d.getVar("BUILD_ARCH"))
24 if not chksum: 24 if not chksum:
25 bb.fatal("Uninative selected but not configured correctly, please set UNINATIVE_CHECKSUM[%s]" % d.getVar("BUILD_ARCH")) 25 bb.fatal("Uninative selected but not configured correctly, please set UNINATIVE_CHECKSUM[%s]" % d.getVar("BUILD_ARCH"))
26 26
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 640daed..d834a8a 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -307,7 +307,7 @@ hardlinkdir () {
307 307
308def check_app_exists(app, d): 308def check_app_exists(app, d):
309 app = d.expand(app).strip() 309 app = d.expand(app).strip()
310 path = d.getVar('PATH', d, True) 310 path = d.getVar('PATH')
311 return bool(bb.utils.which(path, app)) 311 return bool(bb.utils.which(path, app))
312 312
313def explode_deps(s): 313def explode_deps(s):
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7b0ae65..40efb95 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -561,7 +561,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types ${DEBUG_PREFIX_MAP}"
561# Disabled until the option works properly -feliminate-dwarf2-dups 561# Disabled until the option works properly -feliminate-dwarf2-dups
562FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" 562FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
563DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" 563DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
564SELECTED_OPTIMIZATION = "${@d.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD') == '1'], True)}" 564SELECTED_OPTIMIZATION = "${@d.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD') == '1'])}"
565SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" 565SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
566BUILD_OPTIMIZATION = "-O2 -pipe" 566BUILD_OPTIMIZATION = "-O2 -pipe"
567 567
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index ce97d5d..4dc0543 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -1,5 +1,5 @@
1 1
2baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID'), True) or d.getVar('BASELIB')}" 2baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}"
3 3
4MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" 4MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
5MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" 5MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR"
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index e557473..a8644cc 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -129,11 +129,9 @@ class RpmIndexer(Indexer):
129 if default_tune: 129 if default_tune:
130 localdata.setVar("DEFAULTTUNE", default_tune) 130 localdata.setVar("DEFAULTTUNE", default_tune)
131 bb.data.update_data(localdata) 131 bb.data.update_data(localdata)
132 package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS', 132 package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split()
133 True).split()
134 package_archs[eext[1]].reverse() 133 package_archs[eext[1]].reverse()
135 target_os[eext[1]] = localdata.getVar("TARGET_OS", 134 target_os[eext[1]] = localdata.getVar("TARGET_OS").strip()
136 True).strip()
137 135
138 ml_prefix_list = collections.OrderedDict() 136 ml_prefix_list = collections.OrderedDict()
139 for mlib in package_archs: 137 for mlib in package_archs:
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 3de21fc..76806b5 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -30,7 +30,7 @@ def less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
30 return falsevalue 30 return falsevalue
31 31
32def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): 32def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
33 result = bb.utils.vercmp_string(d.getVar(variable,True), checkvalue) 33 result = bb.utils.vercmp_string(d.getVar(variable), checkvalue)
34 if result <= 0: 34 if result <= 0:
35 return truevalue 35 return truevalue
36 else: 36 else:
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py
index cfb4041..a243251 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/meta/lib/oeqa/runtime/_ptest.py
@@ -99,7 +99,7 @@ class PtestRunnerTest(oeRuntimeTest):
99 return complementary_pkgs.split() 99 return complementary_pkgs.split()
100 100
101 def setUpLocal(self): 101 def setUpLocal(self):
102 self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME')) 102 self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR"), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME'))
103 103
104 @skipUnlessPassed('test_ssh') 104 @skipUnlessPassed('test_ssh')
105 def test_ptestrunner(self): 105 def test_ptestrunner(self):
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc
index 547c235..c266437 100644
--- a/meta/recipes-core/glibc/glibc-ld.inc
+++ b/meta/recipes-core/glibc/glibc-ld.inc
@@ -26,7 +26,7 @@ def glibc_dl_info(d):
26 ld_append_if_tune_exists(d, infos, ld_info_all) 26 ld_append_if_tune_exists(d, infos, ld_info_all)
27 27
28 #DEFAULTTUNE_MULTILIB_ORIGINAL 28 #DEFAULTTUNE_MULTILIB_ORIGINAL
29 original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True) 29 original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL")
30 if original_tune: 30 if original_tune:
31 localdata = bb.data.createCopy(d) 31 localdata = bb.data.createCopy(d)
32 localdata.setVar("DEFAULTTUNE", original_tune) 32 localdata.setVar("DEFAULTTUNE", original_tune)
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb
index 52012cc..76d2661 100644
--- a/meta/recipes-core/meta/meta-environment-extsdk.bb
+++ b/meta/recipes-core/meta/meta-environment-extsdk.bb
@@ -6,7 +6,7 @@ PN = "meta-environment-extsdk-${MACHINE}"
6 6
7create_sdk_files_append() { 7create_sdk_files_append() {
8 local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TOPDIR'))} 8 local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TOPDIR'))}
9 local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE',True), d.getVar('TOPDIR'))} 9 local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE'), d.getVar('TOPDIR'))}
10 10
11 toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative 11 toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative
12} 12}
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 078d752..30d2243 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -33,7 +33,7 @@ LICENSE = "GPLv2"
33LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 33LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
34 34
35python __anonymous () { 35python __anonymous () {
36 major = d.getVar("PV",True).split('.')[0] 36 major = d.getVar("PV").split('.')[0]
37 if major == "3": 37 if major == "3":
38 d.setVar("HEADER_FETCH_VER", "3.0") 38 d.setVar("HEADER_FETCH_VER", "3.0")
39 elif major == "4": 39 elif major == "4":
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 8750c3b..cc33c10 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -21,8 +21,8 @@ do_install_append_class-native () {
21 if test "${libdir}" = "${base_libdir}" ; then 21 if test "${libdir}" = "${base_libdir}" ; then
22 return 22 return
23 fi 23 fi
24 librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir'))} 24 librelpath=${@os.path.relpath(d.getVar('libdir'), d.getVar('base_libdir'))}
25 baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir'))} 25 baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'), d.getVar('libdir'))}
26 26
27 # Remove bad symlinks & create the correct symlinks 27 # Remove bad symlinks & create the correct symlinks
28 if test -L ${D}${libdir}/lib${BPN}.so ; then 28 if test -L ${D}${libdir}/lib${BPN}.so ; then