Skip to content

Unpollute init-submodules script #2294

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
jerryz123 merged 1 commit into from
Sep 6, 2025
+3 −5
Merged

Unpollute init-submodules script #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions scripts/build-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ if run_step "8"; then
exit_if_last_command_failed
fi
popd
# Ensure FireMarshal CLI is on PATH in env.sh (idempotent)
replace_content env.sh build-setup-marshal "# line auto-generated by build-setup.sh\n__DIR=\"$CYDIR\"\nPATH=\\$__DIR/software/firemarshal:\\$PATH"
fi

if run_step "10"; then
Expand Down
6 changes: 1 addition & 5 deletions scripts/init-submodules-no-riscv-tools-nolog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ trap 'error_handler $LINENO "$submodule_name"' ERR
function usage
{
echo "Usage: $0 <options>"
echo "Initialize Chipyard submodules and setup initial env.sh script."
echo "Initialize Chipyard submodules"
echo "By default, this will only initialize minimally required submodules"
echo "Enable other submodules with the --full or submodule-specific flags"
echo ""
Expand Down Expand Up @@ -241,7 +241,3 @@ cd "$RDIR"
if [ ! -f ./software/firemarshal/marshal-config.yaml ]; then
echo "firesim-dir: '../../sims/firesim/'" > ./software/firemarshal/marshal-config.yaml
fi

replace_content env.sh init-submodules "# line auto-generated by init-submodules-no-riscv-tools.sh
__DIR=\"$RDIR\"
PATH=\$__DIR/software/firemarshal:\$PATH"
Loading