Skip to content
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

[vs][dash libsai] Use the latest DASH commit #21360

Merged
merged 3 commits into from
Jan 18, 2025
Merged

[vs][dash libsai] Use the latest DASH commit #21360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e39749d
Use the latest DASH commit
jimmyzhai Jan 9, 2025
99808f6
Specify full hash for DASH_SAI_COMMIT
jimmyzhai Jan 9, 2025
232d329
Update DASH_SAI_COMMIT to latest
jimmyzhai Jan 17, 2025
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: 1 addition & 1 deletion rules/dash-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DASH SAI repo: https://github.com/sonic-net/DASH

DASH_SAI_VERSION = 1.0.0
DASH_SAI_COMMIT = cc281333e24ade258773ea843f669251a44d7c9a
DASH_SAI_COMMIT = f5b4b70ec5a0b43b4f63a9375a56a7e20a54ed0e

export DASH_SAI_VERSION
export DASH_SAI_COMMIT
Expand Down
4 changes: 2 additions & 2 deletions sonic-slave-bookworm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ RUN patch -p1 -i /disable-non-manylinux.patch /usr/local/lib/python3.11/dist-pac
RUN pip3 install fastentrypoints mock

# For DASH BMv2
RUN pip3 install jsonpath_ng
RUN pip3 install jsonpath_ng pyyaml-include

# For building sonic_ycabled
# Note: Match version in bookworm
Expand Down Expand Up @@ -750,4 +750,4 @@ RUN mkdir -p /.cargo && $RUST_ROOT/bin/rustup target add armv7-unknown-linux-gnu
RUN mkdir -p /.cargo && $RUST_ROOT/bin/rustup target add aarch64-unknown-linux-gnu && echo "[target.aarch64-unknown-linux-gnu]\nlinker = \"aarch64-linux-gnu-gcc\"" >> /.cargo/config.toml
{% endif -%}
ENV RUSTUP_HOME $RUST_ROOT
ENV PATH $PATH:$RUST_ROOT/bin
ENV PATH $PATH:$RUST_ROOT/bin
1 change: 1 addition & 0 deletions src/dash-sai/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
p4c-bm2-ss -DTARGET_BMV2_V1MODEL $(P4_MAIN) -o $(P4_OUTDIR)/dash_pipeline.json --p4runtime-files $(P4_OUTDIR)/dash_pipeline_p4rt.json,$(P4_OUTDIR)/dash_pipeline_p4rt.txt --toJSON $(P4_OUTDIR)/dash_pipeline_ir.json

# Generate SAI files
sudo ln -sf $(PIPELINE_DIR)/SAI /SAI
pushd SAI
make
popd
Expand Down
Loading