summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/archiver.bbclass28
-rw-r--r--meta/classes/blacklist.bbclass2
-rw-r--r--meta/classes/compress_doc.bbclass14
-rw-r--r--meta/classes/devshell.bbclass4
-rw-r--r--meta/classes/externalsrc.bbclass2
-rw-r--r--meta/classes/image-buildinfo.bbclass2
-rw-r--r--meta/classes/image.bbclass4
-rw-r--r--meta/classes/license.bbclass16
-rw-r--r--meta/classes/package.bbclass4
-rw-r--r--meta/classes/package_rpm.bbclass6
-rw-r--r--meta/classes/package_tar.bbclass2
-rw-r--r--meta/classes/packagefeed-stability.bbclass2
-rw-r--r--meta/classes/patch.bbclass2
-rw-r--r--meta/classes/populate_sdk_ext.bbclass4
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/classes/rootfs_rpm.bbclass2
-rw-r--r--meta/classes/sstate.bbclass14
-rw-r--r--meta/classes/testexport.bbclass2
-rw-r--r--meta/classes/typecheck.bbclass2
-rw-r--r--meta/classes/update-alternatives.bbclass14
-rw-r--r--meta/classes/utility-tasks.bbclass6
21 files changed, 67 insertions, 67 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 52959776c3..ee4790dd68 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -73,9 +73,9 @@ python () {
73 bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn) 73 bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn)
74 return 74 return
75 75
76 ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) 76 ar_src = d.getVarFlag('ARCHIVER_MODE', 'src')
77 ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True) 77 ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata')
78 ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe', True) 78 ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe')
79 79
80 if ar_src == "original": 80 if ar_src == "original":
81 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_original' % pn) 81 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_original' % pn)
@@ -104,7 +104,7 @@ python () {
104 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_recipe' % pn) 104 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_recipe' % pn)
105 105
106 # Output the srpm package 106 # Output the srpm package
107 ar_srpm = d.getVarFlag('ARCHIVER_MODE', 'srpm', True) 107 ar_srpm = d.getVarFlag('ARCHIVER_MODE', 'srpm')
108 if ar_srpm == "1": 108 if ar_srpm == "1":
109 if d.getVar('PACKAGES') != '' and d.getVar('IMAGE_PKGTYPE') == 'rpm': 109 if d.getVar('PACKAGES') != '' and d.getVar('IMAGE_PKGTYPE') == 'rpm':
110 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_package_write_rpm' % pn) 110 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_package_write_rpm' % pn)
@@ -127,7 +127,7 @@ python do_ar_original() {
127 127
128 import shutil, tempfile 128 import shutil, tempfile
129 129
130 if d.getVarFlag('ARCHIVER_MODE', 'src', True) != "original": 130 if d.getVarFlag('ARCHIVER_MODE', 'src') != "original":
131 return 131 return
132 132
133 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 133 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
@@ -191,7 +191,7 @@ python do_ar_original() {
191 191
192python do_ar_patched() { 192python do_ar_patched() {
193 193
194 if d.getVarFlag('ARCHIVER_MODE', 'src', True) != 'patched': 194 if d.getVarFlag('ARCHIVER_MODE', 'src') != 'patched':
195 return 195 return
196 196
197 # Get the ARCHIVER_OUTDIR before we reset the WORKDIR 197 # Get the ARCHIVER_OUTDIR before we reset the WORKDIR
@@ -206,7 +206,7 @@ python do_ar_configured() {
206 import shutil 206 import shutil
207 207
208 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 208 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
209 if d.getVarFlag('ARCHIVER_MODE', 'src', True) == 'configured': 209 if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
210 bb.note('Archiving the configured source...') 210 bb.note('Archiving the configured source...')
211 pn = d.getVar('PN') 211 pn = d.getVar('PN')
212 # "gcc-source-${PV}" recipes don't have "do_configure" 212 # "gcc-source-${PV}" recipes don't have "do_configure"
@@ -226,12 +226,12 @@ python do_ar_configured() {
226 bb.build.exec_func('do_kernel_configme', d) 226 bb.build.exec_func('do_kernel_configme', d)
227 if bb.data.inherits_class('cmake', d): 227 if bb.data.inherits_class('cmake', d):
228 bb.build.exec_func('do_generate_toolchain_file', d) 228 bb.build.exec_func('do_generate_toolchain_file', d)
229 prefuncs = d.getVarFlag('do_configure', 'prefuncs', True) 229 prefuncs = d.getVarFlag('do_configure', 'prefuncs')
230 for func in (prefuncs or '').split(): 230 for func in (prefuncs or '').split():
231 if func != "sysroot_cleansstate": 231 if func != "sysroot_cleansstate":
232 bb.build.exec_func(func, d) 232 bb.build.exec_func(func, d)
233 bb.build.exec_func('do_configure', d) 233 bb.build.exec_func('do_configure', d)
234 postfuncs = d.getVarFlag('do_configure', 'postfuncs', True) 234 postfuncs = d.getVarFlag('do_configure', 'postfuncs')
235 for func in (postfuncs or '').split(): 235 for func in (postfuncs or '').split():
236 if func != "do_qa_configure": 236 if func != "do_qa_configure":
237 bb.build.exec_func(func, d) 237 bb.build.exec_func(func, d)
@@ -279,7 +279,7 @@ def create_diff_gz(d, src_orig, src, ar_outdir):
279 # exclude. 279 # exclude.
280 src_patched = src + '.patched' 280 src_patched = src + '.patched'
281 oe.path.copyhardlinktree(src, src_patched) 281 oe.path.copyhardlinktree(src, src_patched)
282 for i in d.getVarFlag('ARCHIVER_MODE', 'diff-exclude', True).split(): 282 for i in d.getVarFlag('ARCHIVER_MODE', 'diff-exclude').split():
283 bb.utils.remove(os.path.join(src_orig, i), recurse=True) 283 bb.utils.remove(os.path.join(src_orig, i), recurse=True)
284 bb.utils.remove(os.path.join(src_patched, i), recurse=True) 284 bb.utils.remove(os.path.join(src_patched, i), recurse=True)
285 285
@@ -293,9 +293,9 @@ def create_diff_gz(d, src_orig, src, ar_outdir):
293 293
294# Run do_unpack and do_patch 294# Run do_unpack and do_patch
295python do_unpack_and_patch() { 295python do_unpack_and_patch() {
296 if d.getVarFlag('ARCHIVER_MODE', 'src', True) not in \ 296 if d.getVarFlag('ARCHIVER_MODE', 'src') not in \
297 [ 'patched', 'configured'] and \ 297 [ 'patched', 'configured'] and \
298 d.getVarFlag('ARCHIVER_MODE', 'diff', True) != '1': 298 d.getVarFlag('ARCHIVER_MODE', 'diff') != '1':
299 return 299 return
300 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 300 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
301 ar_workdir = d.getVar('ARCHIVER_WORKDIR') 301 ar_workdir = d.getVar('ARCHIVER_WORKDIR')
@@ -314,7 +314,7 @@ python do_unpack_and_patch() {
314 bb.build.exec_func('do_unpack', d) 314 bb.build.exec_func('do_unpack', d)
315 315
316 # Save the original source for creating the patches 316 # Save the original source for creating the patches
317 if d.getVarFlag('ARCHIVER_MODE', 'diff', True) == '1': 317 if d.getVarFlag('ARCHIVER_MODE', 'diff') == '1':
318 src = d.getVar('S').rstrip('/') 318 src = d.getVar('S').rstrip('/')
319 src_orig = '%s.orig' % src 319 src_orig = '%s.orig' % src
320 oe.path.copytree(src, src_orig) 320 oe.path.copytree(src, src_orig)
@@ -324,7 +324,7 @@ python do_unpack_and_patch() {
324 bb.build.exec_func('do_patch', d) 324 bb.build.exec_func('do_patch', d)
325 325
326 # Create the patches 326 # Create the patches
327 if d.getVarFlag('ARCHIVER_MODE', 'diff', True) == '1': 327 if d.getVarFlag('ARCHIVER_MODE', 'diff') == '1':
328 bb.note('Creating diff gz...') 328 bb.note('Creating diff gz...')
329 create_diff_gz(d, src_orig, src, ar_outdir) 329 create_diff_gz(d, src_orig, src, ar_outdir)
330 bb.utils.remove(src_orig, recurse=True) 330 bb.utils.remove(src_orig, recurse=True)
diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass
index c6f422398c..651381986c 100644
--- a/meta/classes/blacklist.bbclass
+++ b/meta/classes/blacklist.bbclass
@@ -33,7 +33,7 @@ python blacklist_multilib_eventhandler() {
33 continue 33 continue
34 for p in prefixes: 34 for p in prefixes:
35 newpkg = p + "-" + pkg 35 newpkg = p + "-" + pkg
36 if not e.data.getVarFlag('PNBLACKLIST', newpkg, True): 36 if not e.data.getVarFlag('PNBLACKLIST', newpkg):
37 e.data.setVarFlag('PNBLACKLIST', newpkg, reason) 37 e.data.setVarFlag('PNBLACKLIST', newpkg, reason)
38} 38}
39 39
diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass
index 069db1997b..ba9772174e 100644
--- a/meta/classes/compress_doc.bbclass
+++ b/meta/classes/compress_doc.bbclass
@@ -40,8 +40,8 @@ python package_do_compress_doc() {
40 compress_cmds = {} 40 compress_cmds = {}
41 decompress_cmds = {} 41 decompress_cmds = {}
42 for mode in compress_list: 42 for mode in compress_list:
43 compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode, True) 43 compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode)
44 decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode, True) 44 decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode)
45 45
46 mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir")) 46 mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir"))
47 if os.path.exists(mandir): 47 if os.path.exists(mandir):
@@ -225,9 +225,9 @@ python compress_doc_updatealternatives () {
225 old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split() 225 old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split()
226 new_names = [] 226 new_names = []
227 for old_name in old_names: 227 for old_name in old_names:
228 old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name, True) 228 old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name)
229 old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True) or \ 229 old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) or \
230 d.getVarFlag('ALTERNATIVE_TARGET', old_name, True) or \ 230 d.getVarFlag('ALTERNATIVE_TARGET', old_name) or \
231 d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \ 231 d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \
232 d.getVar('ALTERNATIVE_TARGET') or \ 232 d.getVar('ALTERNATIVE_TARGET') or \
233 old_link 233 old_link
@@ -241,10 +241,10 @@ python compress_doc_updatealternatives () {
241 new_target = old_target + '.' + compress_mode 241 new_target = old_target + '.' + compress_mode
242 d.delVarFlag('ALTERNATIVE_LINK_NAME', old_name) 242 d.delVarFlag('ALTERNATIVE_LINK_NAME', old_name)
243 d.setVarFlag('ALTERNATIVE_LINK_NAME', new_name, new_link) 243 d.setVarFlag('ALTERNATIVE_LINK_NAME', new_name, new_link)
244 if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True): 244 if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name):
245 d.delVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) 245 d.delVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name)
246 d.setVarFlag('ALTERNATIVE_TARGET_%s' % pkg, new_name, new_target) 246 d.setVarFlag('ALTERNATIVE_TARGET_%s' % pkg, new_name, new_target)
247 elif d.getVarFlag('ALTERNATIVE_TARGET', old_name, True): 247 elif d.getVarFlag('ALTERNATIVE_TARGET', old_name):
248 d.delVarFlag('ALTERNATIVE_TARGET', old_name) 248 d.delVarFlag('ALTERNATIVE_TARGET', old_name)
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):
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 864ace4cb4..4de7ea6fce 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -3,7 +3,7 @@ inherit terminal
3DEVSHELL = "${SHELL}" 3DEVSHELL = "${SHELL}"
4 4
5python do_devshell () { 5python do_devshell () {
6 if d.getVarFlag("do_devshell", "manualfakeroot", True): 6 if d.getVarFlag("do_devshell", "manualfakeroot"):
7 d.prependVar("DEVSHELL", "pseudo ") 7 d.prependVar("DEVSHELL", "pseudo ")
8 fakeenv = d.getVar("FAKEROOTENV").split() 8 fakeenv = d.getVar("FAKEROOTENV").split()
9 for f in fakeenv: 9 for f in fakeenv:
@@ -27,7 +27,7 @@ do_devshell[nostamp] = "1"
27# be done as the normal user. We therfore carefully construct the envionment 27# be done as the normal user. We therfore carefully construct the envionment
28# manually 28# manually
29python () { 29python () {
30 if d.getVarFlag("do_devshell", "fakeroot", True): 30 if d.getVarFlag("do_devshell", "fakeroot"):
31 # We need to signal our code that we want fakeroot however we 31 # We need to signal our code that we want fakeroot however we
32 # can't manipulate the environment and variables here yet (see YOCTO #4795) 32 # can't manipulate the environment and variables here yet (see YOCTO #4795)
33 d.setVarFlag("do_devshell", "manualfakeroot", "1") 33 d.setVarFlag("do_devshell", "manualfakeroot", "1")
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 5ba6c3472b..e115a474b8 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -69,7 +69,7 @@ python () {
69 # Dummy value because the default function can't be called with blank SRC_URI 69 # Dummy value because the default function can't be called with blank SRC_URI
70 d.setVar('SRCPV', '999') 70 d.setVar('SRCPV', '999')
71 71
72 tasks = filter(lambda k: d.getVarFlag(k, "task", True), d.keys()) 72 tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys())
73 73
74 for task in tasks: 74 for task in tasks:
75 if task.endswith("_setscene"): 75 if task.endswith("_setscene"):
diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index 3b79de5ad8..85626f0a68 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -19,7 +19,7 @@ def image_buildinfo_outputvars(vars, listvars, d):
19 ret = "" 19 ret = ""
20 for var in vars: 20 for var in vars:
21 value = d.getVar(var) or "" 21 value = d.getVar(var) or ""
22 if (d.getVarFlag(var, 'type', True) == "list"): 22 if (d.getVarFlag(var, 'type') == "list"):
23 value = oe.utils.squashspaces(value) 23 value = oe.utils.squashspaces(value)
24 ret += "%s = %s\n" % (var, value) 24 ret += "%s = %s\n" % (var, value)
25 return ret.rstrip('\n') 25 return ret.rstrip('\n')
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 28bff9e75a..04fd5f9961 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -51,7 +51,7 @@ FEATURE_PACKAGES_splash = "${SPLASH}"
51IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' 51IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}'
52 52
53def check_image_features(d): 53def check_image_features(d):
54 valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems', True) or "").split() 54 valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems') or "").split()
55 valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() 55 valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys()
56 for var in d: 56 for var in d:
57 if var.startswith("PACKAGE_GROUP_"): 57 if var.startswith("PACKAGE_GROUP_"):
@@ -595,7 +595,7 @@ python create_symlinks() {
595 manifest_name = d.getVar('IMAGE_MANIFEST') 595 manifest_name = d.getVar('IMAGE_MANIFEST')
596 taskname = d.getVar("BB_CURRENTTASK") 596 taskname = d.getVar("BB_CURRENTTASK")
597 subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() 597 subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split()
598 imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.") 598 imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix') or d.expand("${IMAGE_NAME_SUFFIX}.")
599 599
600 if not link_name: 600 if not link_name:
601 return 601 return
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index c5d1204ca1..009ee4a37d 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -249,7 +249,7 @@ def get_boot_dependencies(d):
249 249
250 for task in boot_tasks: 250 for task in boot_tasks:
251 boot_depends_string = "%s %s" % (boot_depends_string, 251 boot_depends_string = "%s %s" % (boot_depends_string,
252 d.getVarFlag(task, "depends", True) or "") 252 d.getVarFlag(task, "depends") or "")
253 boot_depends = [dep.split(":")[0] for dep 253 boot_depends = [dep.split(":")[0] for dep
254 in boot_depends_string.split() 254 in boot_depends_string.split()
255 if not dep.split(":")[0].endswith("-native")] 255 if not dep.split(":")[0].endswith("-native")]
@@ -431,10 +431,10 @@ def find_license_files(d):
431 # unless NO_GENERIC_LICENSE is set. 431 # unless NO_GENERIC_LICENSE is set.
432 for lic_dir in license_source_dirs: 432 for lic_dir in license_source_dirs:
433 if not os.path.isfile(os.path.join(lic_dir, license_type)): 433 if not os.path.isfile(os.path.join(lic_dir, license_type)):
434 if d.getVarFlag('SPDXLICENSEMAP', license_type, True) != None: 434 if d.getVarFlag('SPDXLICENSEMAP', license_type) != None:
435 # Great, there is an SPDXLICENSEMAP. We can copy! 435 # Great, there is an SPDXLICENSEMAP. We can copy!
436 bb.debug(1, "We need to use a SPDXLICENSEMAP for %s" % (license_type)) 436 bb.debug(1, "We need to use a SPDXLICENSEMAP for %s" % (license_type))
437 spdx_generic = d.getVarFlag('SPDXLICENSEMAP', license_type, True) 437 spdx_generic = d.getVarFlag('SPDXLICENSEMAP', license_type)
438 license_source = lic_dir 438 license_source = lic_dir
439 break 439 break
440 elif os.path.isfile(os.path.join(lic_dir, license_type)): 440 elif os.path.isfile(os.path.join(lic_dir, license_type)):
@@ -442,7 +442,7 @@ def find_license_files(d):
442 license_source = lic_dir 442 license_source = lic_dir
443 break 443 break
444 444
445 non_generic_lic = d.getVarFlag('NO_GENERIC_LICENSE', license_type, True) 445 non_generic_lic = d.getVarFlag('NO_GENERIC_LICENSE', license_type)
446 if spdx_generic and license_source: 446 if spdx_generic and license_source:
447 # we really should copy to generic_ + spdx_generic, however, that ends up messing the manifest 447 # we really should copy to generic_ + spdx_generic, however, that ends up messing the manifest
448 # audit up. This should be fixed in emit_pkgdata (or, we actually got and fix all the recipes) 448 # audit up. This should be fixed in emit_pkgdata (or, we actually got and fix all the recipes)
@@ -451,7 +451,7 @@ def find_license_files(d):
451 451
452 # The user may attempt to use NO_GENERIC_LICENSE for a generic license which doesn't make sense 452 # The user may attempt to use NO_GENERIC_LICENSE for a generic license which doesn't make sense
453 # and should not be allowed, warn the user in this case. 453 # and should not be allowed, warn the user in this case.
454 if d.getVarFlag('NO_GENERIC_LICENSE', license_type, True): 454 if d.getVarFlag('NO_GENERIC_LICENSE', license_type):
455 bb.warn("%s: %s is a generic license, please don't use NO_GENERIC_LICENSE for it." % (pn, license_type)) 455 bb.warn("%s: %s is a generic license, please don't use NO_GENERIC_LICENSE for it." % (pn, license_type))
456 456
457 elif non_generic_lic and non_generic_lic in lic_chksums: 457 elif non_generic_lic and non_generic_lic in lic_chksums:
@@ -505,7 +505,7 @@ def return_spdx(d, license):
505 """ 505 """
506 This function returns the spdx mapping of a license if it exists. 506 This function returns the spdx mapping of a license if it exists.
507 """ 507 """
508 return d.getVarFlag('SPDXLICENSEMAP', license, True) 508 return d.getVarFlag('SPDXLICENSEMAP', license)
509 509
510def canonical_license(d, license): 510def canonical_license(d, license):
511 """ 511 """
@@ -514,7 +514,7 @@ def canonical_license(d, license):
514 'X' if availabel and the tailing '+' (so GPLv3+ becomes GPL-3.0+), 514 'X' if availabel and the tailing '+' (so GPLv3+ becomes GPL-3.0+),
515 or the passed license if there is no canonical form. 515 or the passed license if there is no canonical form.
516 """ 516 """
517 lic = d.getVarFlag('SPDXLICENSEMAP', license, True) 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('+'), True)
520 if lic: 520 if lic:
@@ -531,7 +531,7 @@ def expand_wildcard_licenses(d, wildcard_licenses):
531 spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys() 531 spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys()
532 for wld_lic in wildcard_licenses: 532 for wld_lic in wildcard_licenses:
533 spdxflags = fnmatch.filter(spdxmapkeys, wld_lic) 533 spdxflags = fnmatch.filter(spdxmapkeys, wld_lic)
534 licenses += [d.getVarFlag('SPDXLICENSEMAP', flag, True) for flag in spdxflags] 534 licenses += [d.getVarFlag('SPDXLICENSEMAP', flag) for flag in spdxflags]
535 535
536 spdx_lics = (d.getVar('SRC_DISTRIBUTE_LICENSES', False) or '').split() 536 spdx_lics = (d.getVar('SRC_DISTRIBUTE_LICENSES', False) or '').split()
537 for wld_lic in wildcard_licenses: 537 for wld_lic in wildcard_licenses:
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 27034653b8..1f79188236 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -462,7 +462,7 @@ def get_package_additional_metadata (pkg_type, d):
462 if d.getVar(key, False) is None: 462 if d.getVar(key, False) is None:
463 continue 463 continue
464 d.setVarFlag(key, "type", "list") 464 d.setVarFlag(key, "type", "list")
465 if d.getVarFlag(key, "separator", True) is None: 465 if d.getVarFlag(key, "separator") is None:
466 d.setVarFlag(key, "separator", "\\n") 466 d.setVarFlag(key, "separator", "\\n")
467 metadata_fields = [field.strip() for field in oe.data.typed_value(key, d)] 467 metadata_fields = [field.strip() for field in oe.data.typed_value(key, d)]
468 return "\n".join(metadata_fields).strip() 468 return "\n".join(metadata_fields).strip()
@@ -1963,7 +1963,7 @@ python package_depchains() {
1963 1963
1964 for suffix in pkgs: 1964 for suffix in pkgs:
1965 for pkg in pkgs[suffix]: 1965 for pkg in pkgs[suffix]:
1966 if d.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', True): 1966 if d.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs'):
1967 continue 1967 continue
1968 (base, func) = pkgs[suffix][pkg] 1968 (base, func) = pkgs[suffix][pkg]
1969 if suffix == "-dev": 1969 if suffix == "-dev":
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 722c62877a..638cc1b488 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -86,14 +86,14 @@ python write_specfile () {
86 86
87 # append information for logs and patches to %prep 87 # append information for logs and patches to %prep
88 def add_prep(d,spec_files_bottom): 88 def add_prep(d,spec_files_bottom):
89 if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): 89 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d):
90 spec_files_bottom.append('%%prep -n %s' % d.getVar('PN') ) 90 spec_files_bottom.append('%%prep -n %s' % d.getVar('PN') )
91 spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"") 91 spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"")
92 spec_files_bottom.append('') 92 spec_files_bottom.append('')
93 93
94 # append the name of tarball to key word 'SOURCE' in xxx.spec. 94 # append the name of tarball to key word 'SOURCE' in xxx.spec.
95 def tail_source(d): 95 def tail_source(d):
96 if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): 96 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d):
97 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 97 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
98 if not os.path.exists(ar_outdir): 98 if not os.path.exists(ar_outdir):
99 return 99 return
@@ -720,7 +720,7 @@ python do_package_rpm () {
720 cmd = cmd + " --define 'debug_package %{nil}'" 720 cmd = cmd + " --define 'debug_package %{nil}'"
721 cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'" 721 cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
722 cmd = cmd + " --define '_tmppath " + workdir + "'" 722 cmd = cmd + " --define '_tmppath " + workdir + "'"
723 if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): 723 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d):
724 cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" 724 cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'"
725 cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_OUTDIR') + "'" 725 cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_OUTDIR') + "'"
726 cmdsrpm = cmdsrpm + " -bs " + outspecfile 726 cmdsrpm = cmdsrpm + " -bs " + outspecfile
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index 3ff8b8f560..1ffc4169e2 100644
--- a/meta/classes/package_tar.bbclass
+++ b/meta/classes/package_tar.bbclass
@@ -58,7 +58,7 @@ python do_package_tar () {
58 58
59python () { 59python () {
60 if d.getVar('PACKAGES') != '': 60 if d.getVar('PACKAGES') != '':
61 deps = (d.getVarFlag('do_package_write_tar', 'depends', True) or "").split() 61 deps = (d.getVarFlag('do_package_write_tar', 'depends') or "").split()
62 deps.append('tar-native:do_populate_sysroot') 62 deps.append('tar-native:do_populate_sysroot')
63 deps.append('virtual/fakeroot-native:do_populate_sysroot') 63 deps.append('virtual/fakeroot-native:do_populate_sysroot')
64 d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps)) 64 d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps))
diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass
index 3a128073d0..f30dc70def 100644
--- a/meta/classes/packagefeed-stability.bbclass
+++ b/meta/classes/packagefeed-stability.bbclass
@@ -51,7 +51,7 @@ python() {
51 51
52 d.appendVarFlag('do_build', 'recrdeptask', ' ' + pkgcomparefunc) 52 d.appendVarFlag('do_build', 'recrdeptask', ' ' + pkgcomparefunc)
53 53
54 if d.getVarFlag(pkgwritefunc, 'noexec', True) or not d.getVarFlag(pkgwritefunc, 'task', True): 54 if d.getVarFlag(pkgwritefunc, 'noexec') or not d.getVarFlag(pkgwritefunc, 'task'):
55 # Packaging is disabled for this recipe, we shouldn't do anything 55 # Packaging is disabled for this recipe, we shouldn't do anything
56 continue 56 continue
57 57
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 23ba5df48b..d0806bcda2 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -12,7 +12,7 @@ inherit terminal
12 12
13python () { 13python () {
14 if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1': 14 if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1':
15 tasks = list(filter(lambda k: d.getVarFlag(k, "task", True), d.keys())) 15 tasks = list(filter(lambda k: d.getVarFlag(k, "task"), d.keys()))
16 extratasks = [] 16 extratasks = []
17 def follow_chain(task, endtask, chain=None): 17 def follow_chain(task, endtask, chain=None):
18 if not chain: 18 if not chain:
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index be8b6a1f6f..0812eead0a 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -629,7 +629,7 @@ def get_ext_sdk_depends(d):
629 pn = d.getVar('PN') 629 pn = d.getVar('PN')
630 deplist = ['%s:%s' % (pn, dep) for dep in deps] 630 deplist = ['%s:%s' % (pn, dep) for dep in deps]
631 for task in ['do_image_complete', 'do_rootfs', 'do_build']: 631 for task in ['do_image_complete', 'do_rootfs', 'do_build']:
632 deplist.extend((d.getVarFlag(task, 'depends', True) or '').split()) 632 deplist.extend((d.getVarFlag(task, 'depends') or '').split())
633 return ' '.join(deplist) 633 return ' '.join(deplist)
634 634
635python do_sdk_depends() { 635python do_sdk_depends() {
@@ -652,7 +652,7 @@ def get_sdk_ext_rdepends(d):
652 localdata = d.createCopy() 652 localdata = d.createCopy()
653 localdata.appendVar('OVERRIDES', ':task-populate-sdk-ext') 653 localdata.appendVar('OVERRIDES', ':task-populate-sdk-ext')
654 bb.data.update_data(localdata) 654 bb.data.update_data(localdata)
655 return localdata.getVarFlag('do_populate_sdk', 'rdepends', True) 655 return localdata.getVarFlag('do_populate_sdk', 'rdepends')
656 656
657do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" 657do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
658 658
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 8c60398085..6b60c46638 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -28,7 +28,7 @@ MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"
28python () { 28python () {
29 29
30 if d.getVar('BUILD_IMAGES_FROM_FEEDS'): 30 if d.getVar('BUILD_IMAGES_FROM_FEEDS'):
31 flags = d.getVarFlag('do_rootfs', 'recrdeptask', True) 31 flags = d.getVarFlag('do_rootfs', 'recrdeptask')
32 flags = flags.replace("do_package_write_ipk", "") 32 flags = flags.replace("do_package_write_ipk", "")
33 flags = flags.replace("do_deploy", "") 33 flags = flags.replace("do_deploy", "")
34 flags = flags.replace("do_populate_sysroot", "") 34 flags = flags.replace("do_populate_sysroot", "")
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 20beb7c713..b8ff4cb7b6 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -26,7 +26,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
26 26
27python () { 27python () {
28 if d.getVar('BUILD_IMAGES_FROM_FEEDS'): 28 if d.getVar('BUILD_IMAGES_FROM_FEEDS'):
29 flags = d.getVarFlag('do_rootfs', 'recrdeptask', True) 29 flags = d.getVarFlag('do_rootfs', 'recrdeptask')
30 flags = flags.replace("do_package_write_rpm", "") 30 flags = flags.replace("do_package_write_rpm", "")
31 flags = flags.replace("do_deploy", "") 31 flags = flags.replace("do_deploy", "")
32 flags = flags.replace("do_populate_sysroot", "") 32 flags = flags.replace("do_populate_sysroot", "")
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 546e276d9f..a7cd9ec112 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -125,12 +125,12 @@ def sstate_state_fromvars(d, task = None):
125 125
126 if task.startswith("do_"): 126 if task.startswith("do_"):
127 task = task[3:] 127 task = task[3:]
128 inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs', True) or "").split() 128 inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs') or "").split()
129 outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs', True) or "").split() 129 outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs') or "").split()
130 plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs', True) or "").split() 130 plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs') or "").split()
131 lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile', True) or "").split() 131 lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile') or "").split()
132 lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared', True) or "").split() 132 lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared') or "").split()
133 interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs', True) or "").split() 133 interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs') or "").split()
134 if not task or len(inputs) != len(outputs): 134 if not task or len(inputs) != len(outputs):
135 bb.fatal("sstate variables not setup correctly?!") 135 bb.fatal("sstate variables not setup correctly?!")
136 136
@@ -425,7 +425,7 @@ def sstate_clean(ss, d):
425 425
426 d2 = d.createCopy() 426 d2 = d.createCopy()
427 stamp_clean = d.getVar("STAMPCLEAN") 427 stamp_clean = d.getVar("STAMPCLEAN")
428 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) 428 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info')
429 if extrainf: 429 if extrainf:
430 d2.setVar("SSTATE_MANMACH", extrainf) 430 d2.setVar("SSTATE_MANMACH", extrainf)
431 wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf) 431 wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf)
diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index 3f7b2de71d..e287f5a913 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -58,7 +58,7 @@ def exportTests(d,tc):
58 savedata["target"]["server_ip"] = tc.target.server_ip or d.getVar("TEST_SERVER_IP") 58 savedata["target"]["server_ip"] = tc.target.server_ip or d.getVar("TEST_SERVER_IP")
59 59
60 keys = [ key for key in d.keys() if not key.startswith("_") and not key.startswith("BB") \ 60 keys = [ key for key in d.keys() if not key.startswith("_") and not key.startswith("BB") \
61 and not key.startswith("B_pn") and not key.startswith("do_") and not d.getVarFlag(key, "func", True)] 61 and not key.startswith("B_pn") and not key.startswith("do_") and not d.getVarFlag(key, "func")]
62 for key in keys: 62 for key in keys:
63 try: 63 try:
64 savedata["d"][key] = d.getVar(key) 64 savedata["d"][key] = d.getVar(key)
diff --git a/meta/classes/typecheck.bbclass b/meta/classes/typecheck.bbclass
index 6bff7c7138..72da932232 100644
--- a/meta/classes/typecheck.bbclass
+++ b/meta/classes/typecheck.bbclass
@@ -5,7 +5,7 @@
5python check_types() { 5python check_types() {
6 import oe.types 6 import oe.types
7 for key in e.data.keys(): 7 for key in e.data.keys():
8 if e.data.getVarFlag(key, "type", True): 8 if e.data.getVarFlag(key, "type"):
9 oe.data.typed_value(key, e.data) 9 oe.data.typed_value(key, e.data)
10} 10}
11addhandler check_types 11addhandler check_types
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 65da9dadbe..0460bf0241 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -133,12 +133,12 @@ python perform_packagecopy_append () {
133 # If the src == dest, we know we need to rename the dest by appending ${BPN} 133 # If the src == dest, we know we need to rename the dest by appending ${BPN}
134 link_rename = {} 134 link_rename = {}
135 for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): 135 for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split():
136 alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) 136 alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name)
137 if not alt_link: 137 if not alt_link:
138 alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) 138 alt_link = "%s/%s" % (d.getVar('bindir'), alt_name)
139 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) 139 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link)
140 140
141 alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) 141 alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name)
142 alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link 142 alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link
143 # Sometimes alt_target is specified as relative to the link name. 143 # Sometimes alt_target is specified as relative to the link name.
144 alt_target = os.path.join(os.path.dirname(alt_link), alt_target) 144 alt_target = os.path.join(os.path.dirname(alt_link), alt_target)
@@ -198,13 +198,13 @@ python populate_packages_updatealternatives () {
198 alt_setup_links = "" 198 alt_setup_links = ""
199 alt_remove_links = "" 199 alt_remove_links = ""
200 for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): 200 for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split():
201 alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) 201 alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name)
202 alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) 202 alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name)
203 alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link 203 alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link
204 # Sometimes alt_target is specified as relative to the link name. 204 # Sometimes alt_target is specified as relative to the link name.
205 alt_target = os.path.join(os.path.dirname(alt_link), alt_target) 205 alt_target = os.path.join(os.path.dirname(alt_link), alt_target)
206 206
207 alt_priority = d.getVarFlag('ALTERNATIVE_PRIORITY_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_PRIORITY', alt_name, True) 207 alt_priority = d.getVarFlag('ALTERNATIVE_PRIORITY_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_PRIORITY', alt_name)
208 alt_priority = alt_priority or d.getVar('ALTERNATIVE_PRIORITY_%s' % pkg) or d.getVar('ALTERNATIVE_PRIORITY') 208 alt_priority = alt_priority or d.getVar('ALTERNATIVE_PRIORITY_%s' % pkg) or d.getVar('ALTERNATIVE_PRIORITY')
209 209
210 # This shouldn't trigger, as it should have been resolved earlier! 210 # This shouldn't trigger, as it should have been resolved earlier!
@@ -247,8 +247,8 @@ python package_do_filedeps_append () {
247 247
248 for pkg in packages.split(): 248 for pkg in packages.split():
249 for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): 249 for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split():
250 alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) 250 alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name)
251 alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) 251 alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name)
252 alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link 252 alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link
253 253
254 if alt_link == alt_target: 254 if alt_link == alt_target:
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index 68e8217135..da69c3a2fb 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -4,12 +4,12 @@ python do_listtasks() {
4 taskdescs = {} 4 taskdescs = {}
5 maxlen = 0 5 maxlen = 0
6 for e in d.keys(): 6 for e in d.keys():
7 if d.getVarFlag(e, 'task', True): 7 if d.getVarFlag(e, 'task'):
8 maxlen = max(maxlen, len(e)) 8 maxlen = max(maxlen, len(e))
9 if e.endswith('_setscene'): 9 if e.endswith('_setscene'):
10 desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc', True) or '') 10 desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc') or '')
11 else: 11 else:
12 desc = d.getVarFlag(e, 'doc', True) or '' 12 desc = d.getVarFlag(e, 'doc') or ''
13 taskdescs[e] = desc 13 taskdescs[e] = desc
14 14
15 tasks = sorted(taskdescs.keys()) 15 tasks = sorted(taskdescs.keys())