From 74cbec656a7d9e857a3cd3c95789896aeb50abea Mon Sep 17 00:00:00 2001
From: Abhishek Dosi <abdosi@microsoft.com>
Date: Tue, 5 Nov 2024 02:19:54 +0000
Subject: [PATCH 1/3] Added package to compile and link yaml parser in C++

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 dockers/docker-fpm-frr/Dockerfile.j2 | 1 +
 sonic-slave-bookworm/Dockerfile.j2   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index e39ffdadf4cc..532836b15c89 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -16,6 +16,7 @@ RUN apt-get update   && \
         libc-ares2      \
         iproute2        \
         logrotate       \
+        libyaml-cpp-dev \
         libunwind8
 
 RUN groupadd -g ${frr_user_gid} frr
diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
index 145ba7d0a0d9..d578a59c293c 100644
--- a/sonic-slave-bookworm/Dockerfile.j2
+++ b/sonic-slave-bookworm/Dockerfile.j2
@@ -117,6 +117,7 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
         libswitch-perl \
         libzmq5 \
         libzmq3-dev \
+        libyaml-dev \
         uuid-dev \
         jq \
         cron \
@@ -752,4 +753,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

From b3d843f29a62989f5f7113cb54f234e9e6625891 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:53:59 -0800
Subject: [PATCH 2/3] Update Dockerfile.j2

---
 dockers/docker-fpm-frr/Dockerfile.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index 532836b15c89..e39ffdadf4cc 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -16,7 +16,6 @@ RUN apt-get update   && \
         libc-ares2      \
         iproute2        \
         logrotate       \
-        libyaml-cpp-dev \
         libunwind8
 
 RUN groupadd -g ${frr_user_gid} frr

From ebaf63ab0bc26270e56b599167d4e4dbdf8442c2 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:12:36 -0800
Subject: [PATCH 3/3] Update Dockerfile.j2

---
 sonic-slave-bookworm/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
index d578a59c293c..e2fc37801217 100644
--- a/sonic-slave-bookworm/Dockerfile.j2
+++ b/sonic-slave-bookworm/Dockerfile.j2
@@ -117,7 +117,7 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
         libswitch-perl \
         libzmq5 \
         libzmq3-dev \
-        libyaml-dev \
+        libyaml-cpp-dev \
         uuid-dev \
         jq \
         cron \