From 63cd3c91765896307525ebb4f1a8275109a88638 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Tue, 22 Feb 2022 21:02:16 +0000
Subject: [PATCH] pyrex: replace BB_ENV_EXTRAWHITE with
 BB_ENV_PASSTHROUGH_ADDITIONS

As part of OE-Core/Bitbake inclusive language variable renames.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 ci/test.py       | 16 ++++++++--------
 image/capture.sh |  2 +-
 pyrex.py         |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ci/test.py b/ci/test.py
index 9958dd9..6037bdb 100755
--- a/ci/test.py
+++ b/ci/test.py
@@ -96,7 +96,7 @@ def cleanup_env():
         os.environ["PYREX_BUILD_QUIET"] = "0"
         os.environ["PYREX_OEINIT"] = os.path.join(self.pokyroot, "oe-init-build-env")
         os.environ["PYREX_CONFIG_BIND"] = PYREX_ROOT
-        for var in ("SSH_AUTH_SOCK", "BB_ENV_EXTRAWHITE"):
+        for var in ("SSH_AUTH_SOCK", "BB_ENV_PASSTHROUGH_ADDITIONS"):
             if var in os.environ:
                 del os.environ[var]
 
@@ -766,17 +766,17 @@ def test_groups(self):
 
         self.assertEqual(groups, my_groups)
 
-    def test_bb_env_extrawhite(self):
+    def test_BB_ENV_PASSTHROUGH_ADDITIONS(self):
         env = os.environ.copy()
-        env["BB_ENV_EXTRAWHITE"] = "TEST_BB_EXTRA"
+        env["BB_ENV_PASSTHROUGH_ADDITIONS"] = "TEST_BB_EXTRA"
         env["TEST_BB_EXTRA"] = "Hello"
 
         s = set(
             self.assertPyrexContainerShellCommand(
-                "echo $BB_ENV_EXTRAWHITE", env=env, quiet_init=True, capture=True
+                "echo $BB_ENV_PASSTHROUGH_ADDITIONS", env=env, quiet_init=True, capture=True
             ).split()
         )
-        self.assertIn(env["BB_ENV_EXTRAWHITE"], s)
+        self.assertIn(env["BB_ENV_PASSTHROUGH_ADDITIONS"], s)
 
         s = self.assertPyrexContainerShellCommand(
             "echo $TEST_BB_EXTRA", env=env, quiet_init=True, capture=True
@@ -1080,7 +1080,7 @@ def test_top_dir(self):
     def test_env_capture(self):
         extra_white = set(
             self.assertPyrexHostCommand(
-                "echo $BB_ENV_EXTRAWHITE", quiet_init=True, capture=True
+                "echo $BB_ENV_PASSTHROUGH_ADDITIONS", quiet_init=True, capture=True
             ).split()
         )
 
@@ -1094,9 +1094,9 @@ def test_env_capture(self):
         )
         self.assertEqual(builddir, self.build_dir)
 
-    def test_bb_env_extrawhite_parse(self):
+    def test_BB_ENV_PASSTHROUGH_ADDITIONS_parse(self):
         env = os.environ.copy()
-        env["BB_ENV_EXTRAWHITE"] = "TEST_BB_EXTRA"
+        env["BB_ENV_PASSTHROUGH_ADDITIONS"] = "TEST_BB_EXTRA"
         env["TEST_BB_EXTRA"] = "foo"
 
         s = self.assertPyrexHostCommand(
diff --git a/image/capture.sh b/image/capture.sh
index b18e6d6..c753988 100755
--- a/image/capture.sh
+++ b/image/capture.sh
@@ -98,7 +98,7 @@ cat > "$PYREX_CAPTURE_DEST" <<HEREDOC
     "user" : {
         "cwd": "$PWD",
         "export": {
-            "BB_ENV_EXTRAWHITE": "$BB_ENV_EXTRAWHITE",
+            "BB_ENV_PASSTHROUGH_ADDITIONS": "$BB_ENV_PASSTHROUGH_ADDITIONS",
             "BUILDDIR": "$BUILDDIR"
         }
     },
diff --git a/pyrex.py b/pyrex.py
index 92f7c72..dfe6e9a 100755
--- a/pyrex.py
+++ b/pyrex.py
@@ -551,10 +551,10 @@ def prep_container(
     container_envvars.extend(config["run"]["envvars"].split())
     container_envvars.extend(extra_envvars)
 
-    # Pass along BB_ENV_EXTRAWHITE and anything it has whitelisted
-    if "BB_ENV_EXTRAWHITE" in os.environ:
-        engine_args.extend(["-e", "BB_ENV_EXTRAWHITE"])
-        container_envvars.extend(os.environ["BB_ENV_EXTRAWHITE"].split())
+    # Pass along BB_ENV_PASSTHROUGH_ADDITIONS and anything it has whitelisted
+    if "BB_ENV_PASSTHROUGH_ADDITIONS" in os.environ:
+        engine_args.extend(["-e", "BB_ENV_PASSTHROUGH_ADDITIONS"])
+        container_envvars.extend(os.environ["BB_ENV_PASSTHROUGH_ADDITIONS"].split())
 
     # Pass environment variables. If a variable passed with an argument
     # "-e VAR" is not set in the parent environment, podman passes an