diff options
-rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/recipe_sanity.bbclass | 22 |
4 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index a31a53fcb6..5a1bd3abcb 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -472,7 +472,7 @@ python () { | |||
472 | else: | 472 | else: |
473 | raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE', True)) | 473 | raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE', True)) |
474 | 474 | ||
475 | source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', 0) | 475 | source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) |
476 | if not source_mirror_fetch: | 476 | if not source_mirror_fetch: |
477 | need_host = d.getVar('COMPATIBLE_HOST', True) | 477 | need_host = d.getVar('COMPATIBLE_HOST', True) |
478 | if need_host: | 478 | if need_host: |
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 8c8b8a2bf2..8273401e50 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -359,7 +359,7 @@ python () { | |||
359 | # Without de-duplication, gen_conversion_cmds() below | 359 | # Without de-duplication, gen_conversion_cmds() below |
360 | # would create the same compression command multiple times. | 360 | # would create the same compression command multiple times. |
361 | ctypes = set(d.getVar('CONVERSIONTYPES', True).split()) | 361 | ctypes = set(d.getVar('CONVERSIONTYPES', True).split()) |
362 | old_overrides = d.getVar('OVERRIDES', 0) | 362 | old_overrides = d.getVar('OVERRIDES', False) |
363 | 363 | ||
364 | def _image_base_type(type): | 364 | def _image_base_type(type): |
365 | basetype = type | 365 | basetype = type |
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index d0b2db6ae8..a9ca14164b 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1490,7 +1490,7 @@ python package_do_shlibs() { | |||
1490 | import re, pipes | 1490 | import re, pipes |
1491 | import subprocess as sub | 1491 | import subprocess as sub |
1492 | 1492 | ||
1493 | exclude_shlibs = d.getVar('EXCLUDE_FROM_SHLIBS', 0) | 1493 | exclude_shlibs = d.getVar('EXCLUDE_FROM_SHLIBS', False) |
1494 | if exclude_shlibs: | 1494 | if exclude_shlibs: |
1495 | bb.note("not generating shlibs") | 1495 | bb.note("not generating shlibs") |
1496 | return | 1496 | return |
diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index 295611f0f8..add34df9d6 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass | |||
@@ -8,7 +8,7 @@ def bad_runtime_vars(cfgdata, d): | |||
8 | return | 8 | return |
9 | 9 | ||
10 | for var in d.getVar("__recipe_sanity_badruntimevars", True).split(): | 10 | for var in d.getVar("__recipe_sanity_badruntimevars", True).split(): |
11 | val = d.getVar(var, 0) | 11 | val = d.getVar(var, False) |
12 | if val and val != cfgdata.get(var): | 12 | if val and val != cfgdata.get(var): |
13 | __note("%s should be %s_${PN}" % (var, var), d) | 13 | __note("%s should be %s_${PN}" % (var, var), d) |
14 | 14 | ||
@@ -16,11 +16,11 @@ __recipe_sanity_reqvars = "DESCRIPTION" | |||
16 | __recipe_sanity_reqdiffvars = "" | 16 | __recipe_sanity_reqdiffvars = "" |
17 | def req_vars(cfgdata, d): | 17 | def req_vars(cfgdata, d): |
18 | for var in d.getVar("__recipe_sanity_reqvars", True).split(): | 18 | for var in d.getVar("__recipe_sanity_reqvars", True).split(): |
19 | if not d.getVar(var, 0): | 19 | if not d.getVar(var, False): |
20 | __note("%s should be set" % var, d) | 20 | __note("%s should be set" % var, d) |
21 | 21 | ||
22 | for var in d.getVar("__recipe_sanity_reqdiffvars", True).split(): | 22 | for var in d.getVar("__recipe_sanity_reqdiffvars", True).split(): |
23 | val = d.getVar(var, 0) | 23 | val = d.getVar(var, False) |
24 | cfgval = cfgdata.get(var) | 24 | cfgval = cfgdata.get(var) |
25 | 25 | ||
26 | if not val: | 26 | if not val: |
@@ -29,7 +29,7 @@ def req_vars(cfgdata, d): | |||
29 | __note("%s should be defined to something other than default (%s)" % (var, cfgval), d) | 29 | __note("%s should be defined to something other than default (%s)" % (var, cfgval), d) |
30 | 30 | ||
31 | def var_renames_overwrite(cfgdata, d): | 31 | def var_renames_overwrite(cfgdata, d): |
32 | renames = d.getVar("__recipe_sanity_renames", 0) | 32 | renames = d.getVar("__recipe_sanity_renames", False) |
33 | if renames: | 33 | if renames: |
34 | for (key, newkey, oldvalue, newvalue) in renames: | 34 | for (key, newkey, oldvalue, newvalue) in renames: |
35 | if oldvalue != newvalue and oldvalue != cfgdata.get(newkey): | 35 | if oldvalue != newvalue and oldvalue != cfgdata.get(newkey): |
@@ -50,7 +50,7 @@ def can_use_autotools_base(cfgdata, d): | |||
50 | if cfg.find(i) != -1: | 50 | if cfg.find(i) != -1: |
51 | return False | 51 | return False |
52 | 52 | ||
53 | for clsfile in d.getVar("__inherit_cache", 0): | 53 | for clsfile in d.getVar("__inherit_cache", False): |
54 | (base, _) = os.path.splitext(os.path.basename(clsfile)) | 54 | (base, _) = os.path.splitext(os.path.basename(clsfile)) |
55 | if cfg.find("%s_do_configure" % base) != -1: | 55 | if cfg.find("%s_do_configure" % base) != -1: |
56 | __note("autotools_base usage needs verification, spotted %s_do_configure" % base, d) | 56 | __note("autotools_base usage needs verification, spotted %s_do_configure" % base, d) |
@@ -60,7 +60,7 @@ def can_use_autotools_base(cfgdata, d): | |||
60 | def can_delete_FILESPATH(cfgdata, d): | 60 | def can_delete_FILESPATH(cfgdata, d): |
61 | expected = cfgdata.get("FILESPATH") | 61 | expected = cfgdata.get("FILESPATH") |
62 | expectedpaths = d.expand(expected) | 62 | expectedpaths = d.expand(expected) |
63 | unexpanded = d.getVar("FILESPATH", 0) | 63 | unexpanded = d.getVar("FILESPATH", False) |
64 | filespath = d.getVar("FILESPATH", True).split(":") | 64 | filespath = d.getVar("FILESPATH", True).split(":") |
65 | filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)] | 65 | filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)] |
66 | for fp in filespath: | 66 | for fp in filespath: |
@@ -73,7 +73,7 @@ def can_delete_FILESPATH(cfgdata, d): | |||
73 | def can_delete_FILESDIR(cfgdata, d): | 73 | def can_delete_FILESDIR(cfgdata, d): |
74 | expected = cfgdata.get("FILESDIR") | 74 | expected = cfgdata.get("FILESDIR") |
75 | #expected = "${@bb.utils.which(d.getVar('FILESPATH', True), '.')}" | 75 | #expected = "${@bb.utils.which(d.getVar('FILESPATH', True), '.')}" |
76 | unexpanded = d.getVar("FILESDIR", 0) | 76 | unexpanded = d.getVar("FILESDIR", False) |
77 | if unexpanded is None: | 77 | if unexpanded is None: |
78 | return False | 78 | return False |
79 | 79 | ||
@@ -90,7 +90,7 @@ def can_delete_others(p, cfgdata, d): | |||
90 | for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS", | 90 | for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS", |
91 | "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: | 91 | "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: |
92 | #for k in cfgdata: | 92 | #for k in cfgdata: |
93 | unexpanded = d.getVar(k, 0) | 93 | unexpanded = d.getVar(k, False) |
94 | cfgunexpanded = cfgdata.get(k) | 94 | cfgunexpanded = cfgdata.get(k) |
95 | if not cfgunexpanded: | 95 | if not cfgunexpanded: |
96 | continue | 96 | continue |
@@ -117,7 +117,7 @@ python do_recipe_sanity () { | |||
117 | #(can_use_autotools_base, "candidate for use of autotools_base"), | 117 | #(can_use_autotools_base, "candidate for use of autotools_base"), |
118 | (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"), | 118 | (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"), |
119 | ] | 119 | ] |
120 | cfgdata = d.getVar("__recipe_sanity_cfgdata", 0) | 120 | cfgdata = d.getVar("__recipe_sanity_cfgdata", False) |
121 | 121 | ||
122 | for (func, msg) in sanitychecks: | 122 | for (func, msg) in sanitychecks: |
123 | if func(cfgdata, d): | 123 | if func(cfgdata, d): |
@@ -143,8 +143,8 @@ python recipe_sanity_eh () { | |||
143 | 143 | ||
144 | cfgdata = {} | 144 | cfgdata = {} |
145 | for k in d.keys(): | 145 | for k in d.keys(): |
146 | if not isinstance(d.getVar(k, 0), bb.data_smart.DataSmart): | 146 | if not isinstance(d.getVar(k, False), bb.data_smart.DataSmart): |
147 | cfgdata[k] = d.getVar(k, 0) | 147 | cfgdata[k] = d.getVar(k, False) |
148 | 148 | ||
149 | d.setVar("__recipe_sanity_cfgdata", cfgdata) | 149 | d.setVar("__recipe_sanity_cfgdata", cfgdata) |
150 | #d.setVar("__recipe_sanity_cfgdata", d) | 150 | #d.setVar("__recipe_sanity_cfgdata", d) |