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 /scripts | |
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>
Diffstat (limited to 'scripts')
-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 |
5 files changed, 7 insertions, 7 deletions
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: |