summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2024-12-22 08:02:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-23 11:41:38 +0000
commit284a08b6e40761f462da986a6bf11c7bd43d20aa (patch)
tree71cb511a3fcd1ee17288ff7c38192d8a904f566c
parentb51df1baa8433b9fe8c8debbb5ee49a98e31953e (diff)
downloadpoky-284a08b6e40761f462da986a6bf11c7bd43d20aa.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-global/base.bbclass7
-rw-r--r--meta/classes-recipe/features_check.bbclass2
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() {
330 # particular. 330 # particular.
331 # 331 #
332 pn = d.getVar('PN') 332 pn = d.getVar('PN')
333 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) 333 source_mirror_fetch = bb.utils.to_boolean(d.getVar('SOURCE_MIRROR_FETCH', False))
334 if not source_mirror_fetch: 334 if not source_mirror_fetch:
335 provs = (d.getVar("PROVIDES") or "").split() 335 provs = (d.getVar("PROVIDES") or "").split()
336 multiprovidersallowed = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split() 336 multiprovidersallowed = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split()
@@ -553,7 +553,7 @@ python () {
553 d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 553 d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
554 554
555 need_machine = d.getVar('COMPATIBLE_MACHINE') 555 need_machine = d.getVar('COMPATIBLE_MACHINE')
556 if need_machine and not d.getVar('PARSE_ALL_RECIPES', False): 556 if need_machine and not bb.utils.to_boolean(d.getVar('PARSE_ALL_RECIPES', False)):
557 import re 557 import re
558 compat_machines = (d.getVar('MACHINEOVERRIDES') or "").split(":") 558 compat_machines = (d.getVar('MACHINEOVERRIDES') or "").split(":")
559 for m in compat_machines: 559 for m in compat_machines:
@@ -562,7 +562,8 @@ python () {
562 else: 562 else:
563 raise bb.parse.SkipRecipe("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE')) 563 raise bb.parse.SkipRecipe("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE'))
564 564
565 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) or d.getVar('PARSE_ALL_RECIPES', False) 565 source_mirror_fetch = bb.utils.to_boolean(d.getVar('SOURCE_MIRROR_FETCH', False)) or \
566 bb.utils.to_boolean(d.getVar('PARSE_ALL_RECIPES', False))
566 if not source_mirror_fetch: 567 if not source_mirror_fetch:
567 need_host = d.getVar('COMPATIBLE_HOST') 568 need_host = d.getVar('COMPATIBLE_HOST')
568 if need_host: 569 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 @@
16 16
17 17
18python () { 18python () {
19 if d.getVar('PARSE_ALL_RECIPES', False): 19 if bb.utils.to_boolean(d.getVar('PARSE_ALL_RECIPES', False)):
20 return 20 return
21 21
22 unused = True 22 unused = True