diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 13:36:37 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:26 +0000 |
commit | 492214104a55ec56cc483c9b045038e355c6af7b (patch) | |
tree | 028260f5801c3638f8dc474e3a3d2933bf6a8866 | |
parent | 364319817a7371f0efc143269ba3ff238d1631d9 (diff) | |
download | poky-492214104a55ec56cc483c9b045038e355c6af7b.tar.gz |
meta/scripts: Change BB_ENV_EXTRA_WHITE -> BB_ENV_PASSTHROUGH_ADDITIONS
After the change to bitbake, update the references in OE-Core to match the updates.
(From OE-Core rev: 193affb9f28b0116c3fd619834f145326fee08c5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/buildhistory.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/testexport-tarball.bb | 4 | ||||
-rwxr-xr-x | scripts/contrib/test_build_time.sh | 2 | ||||
-rw-r--r-- | scripts/lib/checklayer/__init__.py | 2 | ||||
-rw-r--r-- | scripts/lib/checklayer/cases/common.py | 2 | ||||
-rwxr-xr-x | scripts/oe-buildenv-internal | 6 | ||||
-rwxr-xr-x | scripts/oe-check-sstate | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index daa96f3b63..05f66d10b9 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -31,7 +31,7 @@ BUILDHISTORY_DIR_PACKAGE = "${BUILDHISTORY_DIR}/packages/${MULTIMACH_TARGET_SYS} | |||
31 | # of failed builds. | 31 | # of failed builds. |
32 | # | 32 | # |
33 | # The expected usage is via auto.conf, but passing via the command line also works | 33 | # The expected usage is via auto.conf, but passing via the command line also works |
34 | # with: BB_ENV_EXTRAWHITE=BUILDHISTORY_RESET BUILDHISTORY_RESET=1 | 34 | # with: BB_ENV_PASSTHROUGH_ADDITIONS=BUILDHISTORY_RESET BUILDHISTORY_RESET=1 |
35 | BUILDHISTORY_RESET ?= "" | 35 | BUILDHISTORY_RESET ?= "" |
36 | 36 | ||
37 | BUILDHISTORY_OLD_DIR = "${BUILDHISTORY_DIR}/${@ "old" if "${BUILDHISTORY_RESET}" else ""}" | 37 | BUILDHISTORY_OLD_DIR = "${BUILDHISTORY_DIR}/${@ "old" if "${BUILDHISTORY_RESET}" else ""}" |
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index ef93b6a826..2a80659d9a 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -282,7 +282,7 @@ python copy_buildsystem () { | |||
282 | bb.utils.mkdirhier(uninative_outdir) | 282 | bb.utils.mkdirhier(uninative_outdir) |
283 | shutil.copy(uninative_file, uninative_outdir) | 283 | shutil.copy(uninative_file, uninative_outdir) |
284 | 284 | ||
285 | env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split() | 285 | env_whitelist = (d.getVar('BB_ENV_PASSTHROUGH_ADDITIONS') or '').split() |
286 | env_whitelist_values = {} | 286 | env_whitelist_values = {} |
287 | 287 | ||
288 | # Create local.conf | 288 | # Create local.conf |
@@ -436,7 +436,7 @@ python copy_buildsystem () { | |||
436 | f.write('meta/conf\n') | 436 | f.write('meta/conf\n') |
437 | 437 | ||
438 | # Ensure any variables set from the external environment (by way of | 438 | # Ensure any variables set from the external environment (by way of |
439 | # BB_ENV_EXTRAWHITE) are set in the SDK's configuration | 439 | # BB_ENV_PASSTHROUGH_ADDITIONS) are set in the SDK's configuration |
440 | extralines = [] | 440 | extralines = [] |
441 | for name, value in env_whitelist_values.items(): | 441 | for name, value in env_whitelist_values.items(): |
442 | actualvalue = d.getVar(name) or '' | 442 | actualvalue = d.getVar(name) or '' |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fba99e8f0c..6cccc30fa7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -926,7 +926,7 @@ BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI | |||
926 | BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \ | 926 | BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \ |
927 | SSTATE_DIR SOURCE_DATE_EPOCH" | 927 | SSTATE_DIR SOURCE_DATE_EPOCH" |
928 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ | 928 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ |
929 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE 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 \ |
932 | HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ | 932 | HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ |
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 166671316a..60f6aac837 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -88,8 +88,8 @@ EOF | |||
88 | 88 | ||
89 | if [ "${SDKMACHINE}" = "i686" ]; then | 89 | if [ "${SDKMACHINE}" = "i686" ]; then |
90 | echo 'export NO32LIBS="0"' >>$script | 90 | echo 'export NO32LIBS="0"' >>$script |
91 | echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script | 91 | echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script |
92 | echo '[ $? != 0 ] && export BB_ENV_EXTRAWHITE="NO32LIBS $BB_ENV_EXTRAWHITE"' >>$script | 92 | echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script |
93 | fi | 93 | fi |
94 | } | 94 | } |
95 | 95 | ||
diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index 7cb84a0104..bb9f8ded48 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb | |||
@@ -57,8 +57,8 @@ create_sdk_files:append () { | |||
57 | 57 | ||
58 | if [ "${SDKMACHINE}" = "i686" ]; then | 58 | if [ "${SDKMACHINE}" = "i686" ]; then |
59 | echo 'export NO32LIBS="0"' >>$script | 59 | echo 'export NO32LIBS="0"' >>$script |
60 | echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script | 60 | echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script |
61 | echo '[ $? != 0 ] && export BB_ENV_EXTRAWHITE="NO32LIBS $BB_ENV_EXTRAWHITE"' >>$script | 61 | echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script |
62 | fi | 62 | fi |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/scripts/contrib/test_build_time.sh b/scripts/contrib/test_build_time.sh index 23f238adf6..4012ac7ba7 100755 --- a/scripts/contrib/test_build_time.sh +++ b/scripts/contrib/test_build_time.sh | |||
@@ -97,7 +97,7 @@ if [ $? != 0 ] ; then | |||
97 | exit 251 | 97 | exit 251 |
98 | fi | 98 | fi |
99 | 99 | ||
100 | if [ "$BB_ENV_EXTRAWHITE" != "" ] ; then | 100 | if [ "BB_ENV_PASSTHROUGH_ADDITIONS" != "" ] ; then |
101 | echo "WARNING: you are running after sourcing the build environment script, this is not recommended" | 101 | echo "WARNING: you are running after sourcing the build environment script, this is not recommended" |
102 | fi | 102 | fi |
103 | 103 | ||
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index 9713570841..aa946f3036 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py | |||
@@ -293,7 +293,7 @@ def get_signatures(builddir, failsafe=False, machine=None, extravars=None): | |||
293 | sigs = {} | 293 | sigs = {} |
294 | tune2tasks = {} | 294 | tune2tasks = {} |
295 | 295 | ||
296 | cmd = 'BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BB_SIGNATURE_HANDLER" BB_SIGNATURE_HANDLER="OEBasicHash" ' | 296 | cmd = 'BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS BB_SIGNATURE_HANDLER" BB_SIGNATURE_HANDLER="OEBasicHash" ' |
297 | if extravars: | 297 | if extravars: |
298 | cmd += extravars | 298 | cmd += extravars |
299 | cmd += ' ' | 299 | cmd += ' ' |
diff --git a/scripts/lib/checklayer/cases/common.py b/scripts/lib/checklayer/cases/common.py index 318cda169e..491a13953c 100644 --- a/scripts/lib/checklayer/cases/common.py +++ b/scripts/lib/checklayer/cases/common.py | |||
@@ -61,7 +61,7 @@ class CommonCheckLayer(OECheckLayerTestCase): | |||
61 | ''' | 61 | ''' |
62 | msg = [] | 62 | msg = [] |
63 | try: | 63 | try: |
64 | get_signatures(self.td['builddir'], failsafe=False, machine=None, extravars='BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE INHERIT" INHERIT="yocto-check-layer"') | 64 | get_signatures(self.td['builddir'], failsafe=False, machine=None, extravars='BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS INHERIT" INHERIT="yocto-check-layer"') |
65 | except RuntimeError as ex: | 65 | except RuntimeError as ex: |
66 | msg.append(str(ex)) | 66 | msg.append(str(ex)) |
67 | if msg: | 67 | if msg: |
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index e0d920f2fc..485d4c52e1 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal | |||
@@ -106,13 +106,13 @@ unset BITBAKEDIR newpath | |||
106 | export BUILDDIR | 106 | export BUILDDIR |
107 | export PATH | 107 | export PATH |
108 | 108 | ||
109 | BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ | 109 | BB_ENV_PASSTHROUGH_ADDITIONS_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ |
110 | HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ | 110 | HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ |
111 | all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ | 111 | all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ |
112 | SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ | 112 | SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ |
113 | SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \ | 113 | SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \ |
114 | BB_LOGCONFIG" | 114 | BB_LOGCONFIG" |
115 | 115 | ||
116 | BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" | 116 | BB_ENV_PASSTHROUGH_ADDITIONS="$(echo $BB_ENV_PASSTHROUGH_ADDITIONS $BB_ENV_PASSTHROUGH_ADDITIONS_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" |
117 | 117 | ||
118 | export BB_ENV_EXTRAWHITE | 118 | export BB_ENV_PASSTHROUGH_ADDITIONS |
diff --git a/scripts/oe-check-sstate b/scripts/oe-check-sstate index 59bcb32a8c..f4cc5869de 100755 --- a/scripts/oe-check-sstate +++ b/scripts/oe-check-sstate | |||
@@ -47,7 +47,7 @@ def check(args): | |||
47 | try: | 47 | try: |
48 | env = os.environ.copy() | 48 | env = os.environ.copy() |
49 | if not args.same_tmpdir: | 49 | if not args.same_tmpdir: |
50 | env['BB_ENV_EXTRAWHITE'] = env.get('BB_ENV_EXTRAWHITE', '') + ' TMPDIR:forcevariable' | 50 | env['BB_ENV_PASSTHROUGH_ADDITIONS'] = env.get('BB_ENV_PASSTHROUGH_ADDITIONS', '') + ' TMPDIR:forcevariable' |
51 | env['TMPDIR:forcevariable'] = tmpdir | 51 | env['TMPDIR:forcevariable'] = tmpdir |
52 | 52 | ||
53 | try: | 53 | try: |