From 284a08b6e40761f462da986a6bf11c7bd43d20aa Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 22 Dec 2024 08:02:37 -0800 Subject: base/features_check: Make PARSE_ALL_RECIPES and SOURCE_MIRROR_FETCH boolean So that value "0" can turn them off. (From OE-Core rev: 1a2afcd0773c5ec5946d1dfc27bde585c52a5724) Signed-off-by: Robert Yang Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/classes-global/base.bbclass | 7 ++++--- meta/classes-recipe/features_check.bbclass | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 101ecdcf0f..c8268abcdf 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -330,7 +330,7 @@ python base_eventhandler() { # particular. # pn = d.getVar('PN') - source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) + source_mirror_fetch = bb.utils.to_boolean(d.getVar('SOURCE_MIRROR_FETCH', False)) if not source_mirror_fetch: provs = (d.getVar("PROVIDES") or "").split() multiprovidersallowed = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split() @@ -553,7 +553,7 @@ python () { d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') need_machine = d.getVar('COMPATIBLE_MACHINE') - if need_machine and not d.getVar('PARSE_ALL_RECIPES', False): + if need_machine and not bb.utils.to_boolean(d.getVar('PARSE_ALL_RECIPES', False)): import re compat_machines = (d.getVar('MACHINEOVERRIDES') or "").split(":") for m in compat_machines: @@ -562,7 +562,8 @@ python () { else: raise bb.parse.SkipRecipe("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE')) - source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) or d.getVar('PARSE_ALL_RECIPES', False) + source_mirror_fetch = bb.utils.to_boolean(d.getVar('SOURCE_MIRROR_FETCH', False)) or \ + bb.utils.to_boolean(d.getVar('PARSE_ALL_RECIPES', False)) if not source_mirror_fetch: need_host = d.getVar('COMPATIBLE_HOST') if need_host: diff --git a/meta/classes-recipe/features_check.bbclass b/meta/classes-recipe/features_check.bbclass index 163a7bc3fc..4e122ecaef 100644 --- a/meta/classes-recipe/features_check.bbclass +++ b/meta/classes-recipe/features_check.bbclass @@ -16,7 +16,7 @@ python () { - if d.getVar('PARSE_ALL_RECIPES', False): + if bb.utils.to_boolean(d.getVar('PARSE_ALL_RECIPES', False)): return unused = True -- cgit v1.2.3-54-g00ecf