summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-16 13:49:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-21 23:37:27 +0000
commit98b3ed1b2e113bdd028dcf22477892ea8cfe007b (patch)
tree9311d25a78b62db866892345fce92f71b3b875b3 /meta
parent492214104a55ec56cc483c9b045038e355c6af7b (diff)
downloadpoky-98b3ed1b2e113bdd028dcf22477892ea8cfe007b.tar.gz
meta/scripts: Handle bitbake variable renaming
After other variables were renamed in bitbake, update OE-Core to match. (From OE-Core rev: 91812ba5a34598e03ad860745707c7cba1ae5d91) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/icecc.bbclass2
-rw-r--r--meta/classes/multilib_global.bbclass4
-rw-r--r--meta/classes/populate_sdk_ext.bbclass4
-rw-r--r--meta/classes/staging.bbclass4
-rw-r--r--meta/classes/uninative.bbclass4
-rw-r--r--meta/classes/waf.bbclass2
-rw-r--r--meta/conf/bitbake.conf6
8 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 5f4956a1d3..de5135cf6b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -329,7 +329,7 @@ python base_eventhandler() {
329 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) 329 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False)
330 if not source_mirror_fetch: 330 if not source_mirror_fetch:
331 provs = (d.getVar("PROVIDES") or "").split() 331 provs = (d.getVar("PROVIDES") or "").split()
332 multiwhitelist = (d.getVar("MULTI_PROVIDER_WHITELIST") or "").split() 332 multiwhitelist = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split()
333 for p in provs: 333 for p in provs:
334 if p.startswith("virtual/") and p not in multiwhitelist: 334 if p.startswith("virtual/") and p not in multiwhitelist:
335 profprov = d.getVar("PREFERRED_PROVIDER_" + p) 335 profprov = d.getVar("PREFERRED_PROVIDER_" + p)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 3bbd2645af..7a6be68aba 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -28,7 +28,7 @@
28#Error checking is kept to minimum so double check any parameters you pass to the class 28#Error checking is kept to minimum so double check any parameters you pass to the class
29########################################################################################### 29###########################################################################################
30 30
31BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_BL \ 31BB_BASEHASH_IGNORE_VARS += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_BL \
32 ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH ICECC_ENV_EXEC \ 32 ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH ICECC_ENV_EXEC \
33 ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \ 33 ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \
34 ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \ 34 ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index dae015cdaf..ab8ca0e41d 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -137,14 +137,14 @@ def preferred_ml_updates(d):
137 prov = prov.replace("virtual/", "") 137 prov = prov.replace("virtual/", "")
138 return "virtual/" + prefix + "-" + prov 138 return "virtual/" + prefix + "-" + prov
139 139
140 mp = (d.getVar("MULTI_PROVIDER_WHITELIST") or "").split() 140 mp = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split()
141 extramp = [] 141 extramp = []
142 for p in mp: 142 for p in mp:
143 if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: 143 if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p:
144 continue 144 continue
145 for pref in prefixes: 145 for pref in prefixes:
146 extramp.append(translate_provide(pref, p)) 146 extramp.append(translate_provide(pref, p))
147 d.setVar("MULTI_PROVIDER_WHITELIST", " ".join(mp + extramp)) 147 d.setVar("BB_MULTI_PROVIDER_ALLOWED", " ".join(mp + extramp))
148 148
149 abisafe = (d.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() 149 abisafe = (d.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split()
150 extras = [] 150 extras = []
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 2a80659d9a..a6f1506a39 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -354,10 +354,10 @@ python copy_buildsystem () {
354 f.write('SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n\n') 354 f.write('SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n\n')
355 355
356 # We want to be able to set this without a full reparse 356 # We want to be able to set this without a full reparse
357 f.write('BB_HASHCONFIG_WHITELIST:append = " SIGGEN_UNLOCKED_RECIPES"\n\n') 357 f.write('BB_HASHCONFIG_IGNORE_VARS:append = " SIGGEN_UNLOCKED_RECIPES"\n\n')
358 358
359 # Set up whitelist for run on install 359 # Set up whitelist for run on install
360 f.write('BB_SETSCENE_ENFORCE_WHITELIST = "%:* *:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n') 360 f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* *:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n')
361 361
362 # Hide the config information from bitbake output (since it's fixed within the SDK) 362 # Hide the config information from bitbake output (since it's fixed within the SDK)
363 f.write('BUILDCFG_HEADER = ""\n\n') 363 f.write('BUILDCFG_HEADER = ""\n\n')
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 71302b6e12..574700260f 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -104,7 +104,7 @@ python do_populate_sysroot () {
104 for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS') or '').split(): 104 for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS') or '').split():
105 bb.build.exec_func(f, d) 105 bb.build.exec_func(f, d)
106 pn = d.getVar("PN") 106 pn = d.getVar("PN")
107 multiprov = d.getVar("MULTI_PROVIDER_WHITELIST").split() 107 multiprov = d.getVar("BB_MULTI_PROVIDER_ALLOWED").split()
108 provdir = d.expand("${SYSROOT_DESTDIR}${base_prefix}/sysroot-providers/") 108 provdir = d.expand("${SYSROOT_DESTDIR}${base_prefix}/sysroot-providers/")
109 bb.utils.mkdirhier(provdir) 109 bb.utils.mkdirhier(provdir)
110 for p in d.getVar("PROVIDES").split(): 110 for p in d.getVar("PROVIDES").split():
@@ -116,7 +116,7 @@ python do_populate_sysroot () {
116} 116}
117 117
118do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" 118do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}"
119do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" 119do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED"
120 120
121POPULATESYSROOTDEPS = "" 121POPULATESYSROOTDEPS = ""
122POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" 122POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 4412d7c567..6a9e862bcd 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -9,8 +9,8 @@ UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc-${UNINATIVE_VERSION}.tar.xz"
9#UNINATIVE_CHECKSUM[x86_64] = "dead" 9#UNINATIVE_CHECKSUM[x86_64] = "dead"
10UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/" 10UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/"
11 11
12# Enabling uninative will change the following variables so they need to go the parsing white list to prevent multiple recipe parsing 12# Enabling uninative will change the following variables so they need to go the parsing ignored variables list to prevent multiple recipe parsing
13BB_HASHCONFIG_WHITELIST += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS BUILD_LDFLAGS" 13BB_HASHCONFIG_IGNORE_VARS += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS BUILD_LDFLAGS"
14 14
15addhandler uninative_event_fetchloader 15addhandler uninative_event_fetchloader
16uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted" 16uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted"
diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index bc594d3c6b..464564afa1 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -39,7 +39,7 @@ def waflock_hash(d):
39# directory (e.g. if the source is coming from externalsrc and was previously 39# directory (e.g. if the source is coming from externalsrc and was previously
40# configured elsewhere). 40# configured elsewhere).
41export WAFLOCK = ".lock-waf_oe_${@waflock_hash(d)}_build" 41export WAFLOCK = ".lock-waf_oe_${@waflock_hash(d)}_build"
42BB_HASHBASE_WHITELIST += "WAFLOCK" 42BB_BASEHASH_IGNORE_VARS += "WAFLOCK"
43 43
44python waf_preconfigure() { 44python waf_preconfigure() {
45 import subprocess 45 import subprocess
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6cccc30fa7..7faf6f05f4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -275,7 +275,7 @@ DEPENDS = ""
275PROVIDES = "" 275PROVIDES = ""
276PROVIDES:prepend = "${PN} " 276PROVIDES:prepend = "${PN} "
277 277
278MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" 278BB_MULTI_PROVIDER_ALLOWED = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"
279 279
280SOLIBS = ".so.*" 280SOLIBS = ".so.*"
281SOLIBS:darwin = ".dylib" 281SOLIBS:darwin = ".dylib"
@@ -923,9 +923,9 @@ BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI
923 SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ 923 SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \
924 SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES \ 924 SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES \
925 OMP_NUM_THREADS BB_CURRENTTASK" 925 OMP_NUM_THREADS BB_CURRENTTASK"
926BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \ 926BB_BASEHASH_IGNORE_VARS ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \
927 SSTATE_DIR SOURCE_DATE_EPOCH" 927 SSTATE_DIR SOURCE_DATE_EPOCH"
928BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ 928BB_HASHCONFIG_IGNORE_VARS ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \
929 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_PASSTHROUGH_ADDITIONS DISABLE_SANITY_CHECKS \ 929 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_PASSTHROUGH_ADDITIONS DISABLE_SANITY_CHECKS \
930 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ 930 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
931 GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ 931 GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \