From e39749da289c3ab0f03b835197ad267b7a775b9b Mon Sep 17 00:00:00 2001
From: Junhua Zhai <junhua.zhai@outlook.com>
Date: Thu, 9 Jan 2025 00:41:01 +0000
Subject: [PATCH 1/3] Use the latest DASH commit

---
 rules/dash-sai.mk                  | 2 +-
 sonic-slave-bookworm/Dockerfile.j2 | 4 ++--
 src/dash-sai/Makefile              | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/dash-sai.mk b/rules/dash-sai.mk
index 7accf72e901..b0ffe239f0a 100644
--- a/rules/dash-sai.mk
+++ b/rules/dash-sai.mk
@@ -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 = 88a4771
 
 export DASH_SAI_VERSION
 export DASH_SAI_COMMIT
diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
index 92a15eaf997..626317cda77 100644
--- a/sonic-slave-bookworm/Dockerfile.j2
+++ b/sonic-slave-bookworm/Dockerfile.j2
@@ -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
@@ -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
\ No newline at end of file
+ENV PATH $PATH:$RUST_ROOT/bin
diff --git a/src/dash-sai/Makefile b/src/dash-sai/Makefile
index 927f799f9b7..4dfc908f613 100644
--- a/src/dash-sai/Makefile
+++ b/src/dash-sai/Makefile
@@ -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

From 99808f600aab1de35a0fde772c9bb487b8e48327 Mon Sep 17 00:00:00 2001
From: Junhua Zhai <junhua.zhai@outlook.com>
Date: Thu, 9 Jan 2025 10:31:33 +0000
Subject: [PATCH 2/3] Specify full hash for DASH_SAI_COMMIT

---
 rules/dash-sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/dash-sai.mk b/rules/dash-sai.mk
index b0ffe239f0a..821c65a3a0b 100644
--- a/rules/dash-sai.mk
+++ b/rules/dash-sai.mk
@@ -1,7 +1,7 @@
 # DASH SAI repo: https://github.com/sonic-net/DASH
 
 DASH_SAI_VERSION = 1.0.0
-DASH_SAI_COMMIT = 88a4771
+DASH_SAI_COMMIT = 88a477182f2ea4d20e6ad32ddcdcb253ee6c292c
 
 export DASH_SAI_VERSION
 export DASH_SAI_COMMIT

From 232d329c6c2e17f37496d381ba8ae05d50f7441c Mon Sep 17 00:00:00 2001
From: Junhua Zhai <junhua.zhai@outlook.com>
Date: Fri, 17 Jan 2025 02:08:39 +0000
Subject: [PATCH 3/3] Update DASH_SAI_COMMIT to latest

---
 rules/dash-sai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/dash-sai.mk b/rules/dash-sai.mk
index 821c65a3a0b..54f3771eeee 100644
--- a/rules/dash-sai.mk
+++ b/rules/dash-sai.mk
@@ -1,7 +1,7 @@
 # DASH SAI repo: https://github.com/sonic-net/DASH
 
 DASH_SAI_VERSION = 1.0.0
-DASH_SAI_COMMIT = 88a477182f2ea4d20e6ad32ddcdcb253ee6c292c
+DASH_SAI_COMMIT = f5b4b70ec5a0b43b4f63a9375a56a7e20a54ed0e
 
 export DASH_SAI_VERSION
 export DASH_SAI_COMMIT