From 82aa6fa828bf94ed1636916b4ad67fb678a3c7bf Mon Sep 17 00:00:00 2001
From: Christian Leithner <christian_leithner@comcast.com>
Date: Wed, 3 Jun 2026 14:12:20 +0000
Subject: [PATCH 1/3] Shell compatibility for barton-matter

Barton-matter heavily depends on bash syntax, but yocto will
just invoke `sh` for shell scripts. This could be non-bash
shells. This commit attempts to make barton-matter more
compatibile with non-bash shells.

Change-Id: Idbda24886b5709c066a358b13e54d98a0c419b46
---
 .../barton-matter/barton-matter_1.5.1.0.bb    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb b/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
index 7aba987..abee604 100644
--- a/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
+++ b/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
@@ -31,7 +31,7 @@ SRC_URI:append = " file://0009-pigweed-upgrade-setuptools-for-yocto.patch;patchd
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
-PR = "r0"
+PR = "r1"
 
 DEPENDS:append = " \
     curl-native \
@@ -122,6 +122,20 @@ do_init_submodules() {
 
 addtask do_init_submodules after do_unpack before do_patch
 
+# Source a bash-only script (bootstrap.sh / activate.sh) in a bash subprocess
+# and import all new/changed environment variables back into the current shell.
+# Usage: _matter_source_bash_env <script>
+_matter_source_bash_env() {
+    eval "$(bash -c '
+        set -e
+        _env_before="$(env | sort)"
+        . "$1" >&2
+        comm -13 <(printf "%s\n" "$_env_before") <(env | sort) | while IFS="=" read -r _k _v; do
+            [ -n "$_k" ] && printf "export %s=%q\n" "$_k" "$_v"
+        done
+    ' _ "$1")"
+}
+
 do_configure:prepend() {
     # Install our build files into a dummy directory within the matter repo.
     # This makes it easier to build as gn has restrictions around visibility
@@ -164,10 +178,10 @@ do_configure:prepend() {
     export TMP="${WORKDIR}/zap-tmp"
 
     # Bootstrap Matter/Pigweed — sets PATH so gn/ninja from pigweed are available.
-    # Must be sourced in the same shell so the class's gn_do_configure sees the PATH.
+    # bootstrap.sh uses bash-specific syntax so run it under bash explicitly.
     cd ${S}
     chmod +x ./scripts/bootstrap.sh
-    source ./scripts/bootstrap.sh
+    _matter_source_bash_env ./scripts/bootstrap.sh
 
     # Generate project config
     rm -rf ${MATTER_PROJECT_CONFIG_DIR}
@@ -188,7 +202,7 @@ do_compile:prepend() {
     export SSL_CERT_FILE=${STAGING_DIR_NATIVE}/etc/ssl/certs/ca-certificates.crt
     export YOCTO_BUILD=1
     export TMP="${WORKDIR}/zap-tmp"
-    source ./scripts/activate.sh
+    _matter_source_bash_env ./scripts/activate.sh
 }
 
 do_install() {

From c2d7750664678a1a01d5be4c0a46c204e638298d Mon Sep 17 00:00:00 2001
From: Christian Leithner <87389808+cleithner-comcast@users.noreply.github.com>
Date: Wed, 3 Jun 2026 09:26:20 -0500
Subject: [PATCH 2/3] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 recipes-matter/barton-matter/barton-matter_1.5.1.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb b/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
index abee604..951a9d5 100644
--- a/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
+++ b/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
@@ -131,7 +131,9 @@ _matter_source_bash_env() {
         _env_before="$(env | sort)"
         . "$1" >&2
         comm -13 <(printf "%s\n" "$_env_before") <(env | sort) | while IFS="=" read -r _k _v; do
-            [ -n "$_k" ] && printf "export %s=%q\n" "$_k" "$_v"
+            [ -n "$_k" ] || continue
+            _v_escaped=$(printf "%s" "$_v" | sed "s/'/'\\''/g")
+            printf "export %s='%s'\n" "$_k" "$_v_escaped"
         done
     ' _ "$1")"
 }

From 2537654514632f1d33c1fa6fce255a7da3070580 Mon Sep 17 00:00:00 2001
From: Christian Leithner <87389808+cleithner-comcast@users.noreply.github.com>
Date: Wed, 3 Jun 2026 09:33:55 -0500
Subject: [PATCH 3/3] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../barton-matter/barton-matter_1.5.1.0.bb    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb b/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
index 951a9d5..47c75ed 100644
--- a/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
+++ b/recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
@@ -126,16 +126,17 @@ addtask do_init_submodules after do_unpack before do_patch
 # and import all new/changed environment variables back into the current shell.
 # Usage: _matter_source_bash_env <script>
 _matter_source_bash_env() {
-    eval "$(bash -c '
-        set -e
-        _env_before="$(env | sort)"
-        . "$1" >&2
-        comm -13 <(printf "%s\n" "$_env_before") <(env | sort) | while IFS="=" read -r _k _v; do
-            [ -n "$_k" ] || continue
-            _v_escaped=$(printf "%s" "$_v" | sed "s/'/'\\''/g")
-            printf "export %s='%s'\n" "$_k" "$_v_escaped"
-        done
-    ' _ "$1")"
+    eval "$(bash -s -- "$1" <<'BASH'
+set -e
+_env_before="$(env | sort)"
+. "$1" >&2
+comm -13 <(printf "%s\n" "$_env_before") <(env | sort) | while IFS="=" read -r _k _v; do
+    [ -n "$_k" ] || continue
+    _v_escaped=$(printf "%s" "$_v" | sed "s/'/'\\''/g")
+    printf "export %s='%s'\n" "$_k" "$_v_escaped"
+done
+BASH
+)"
 }
 
 do_configure:prepend() {