Skip to content

Shell compatibility for barton-matter #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cleithner-comcast merged 3 commits into from
Jun 3, 2026
Merged

Shell compatibility for barton-matter #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82aa6fa
Shell compatibility for barton-matter
cleithner-comcast Jun 3, 2026
c2d7750
Potential fix for pull request finding
cleithner-comcast Jun 3, 2026
2537654
Potential fix for pull request finding
cleithner-comcast Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions recipes-matter/barton-matter/barton-matter_1.5.1.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -122,6 +122,23 @@ 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 -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
)"
Comment thread
cleithner-comcast marked this conversation as resolved.
}
Comment thread
cleithner-comcast marked this conversation as resolved.

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
Expand Down Expand Up @@ -164,10 +181,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}
Expand All @@ -188,7 +205,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() {
Expand Down
Loading