From df36ef0e4b9f9555c20a26202e7976474bb73057 Mon Sep 17 00:00:00 2001
From: Hasan Naqvi <56742004+hasan-brcm@users.noreply.github.com>
Date: Sun, 21 Aug 2022 17:04:47 -0700
Subject: [PATCH] Bullseye frr (#11777)

Why I did it
Migrate FRR to bullseye

How I did it
Makefile and docker config changes to refer to bullseye instead of buster.

How to verify it
Build bullseye frr docker.

Co-authored-by: Rajendra Dendukuri <rajendra.dendukuri@broadcom.com>
---
 dockers/docker-fpm-frr/Dockerfile.j2 |  3 +--
 rules/docker-fpm-frr.mk              | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
index f885180c37d4..ad665e71ceae 100644
--- a/dockers/docker-fpm-frr/Dockerfile.j2
+++ b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 ARG frr_user_uid
@@ -16,7 +16,6 @@ RUN apt-get update   && \
     apt-get install -y  \
         libc-ares2      \
         iproute2        \
-        libjson-c3      \
         logrotate       \
         libunwind8
 
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index ff594288419c..861e1d8e8b41 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -8,13 +8,13 @@ $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/$(DOCKER_FPM_FRR_STEM)
 $(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK)
 
 $(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_SNMP) $(SWSS) $(LIBYANG2)
-$(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
+$(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS)
 $(DOCKER_FPM_FRR)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) \
                                 $(FRR_DBG) $(FRR_SNMP_DBG) $(LIBYANG2_DBG)
 
-$(DOCKER_FPM_FRR)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_FPM_FRR)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
+$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
 
 $(DOCKER_FPM_FRR)_VERSION = 1.0.0
 $(DOCKER_FPM_FRR)_PACKAGE_NAME = fpm-frr
@@ -40,5 +40,5 @@ $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSB:/usr/bin/TSB
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSC:/usr/bin/TSC
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TS:/usr/bin/TS
 
-SONIC_BUSTER_DOCKERS += $(DOCKER_FPM_FRR)
-SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_FPM_FRR_DBG)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_FPM_FRR)
+SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_FPM_FRR_DBG)