[submodule]: Update submodule sonic-swss/sonic-dash-api/protobuf

.gitmodules

@@ -112,8 +112,8 @@
 [submodule "src/dhcpmon"]
 	path = src/dhcpmon
 	url = https://github.com/sonic-net/sonic-dhcpmon.git
-[submodule "src/sonic-dash-api/sonic-dash-api"]
-	path = src/sonic-dash-api/sonic-dash-api
+[submodule "src/sonic-dash-api"]
+	path = src/sonic-dash-api
 	url = https://github.com/sonic-net/sonic-dash-api.git
 [submodule "platform/marvell-arm64/mrvl-prestera"]
 	path = platform/marvell-arm64/mrvl-prestera

rules/protobuf.mk

@@ -1,32 +1,37 @@
 # protobuf package
+# Protobuf 3.21.12 has been released in bookworm, So we only need to build it
+# in the bullseye environment.
+ifeq ($(BLDENV),bullseye)
 
-PROTOBUF_VERSION = 3.21.12
-PROTOBUF_VERSION_FULL = $(PROTOBUF_VERSION)-3
+    PROTOBUF_VERSION = 3.21.12
+    PROTOBUF_VERSION_FULL = $(PROTOBUF_VERSION)-3
 
-export PROTOBUF_VERSION
-export PROTOBUF_VERSION_FULL
+    export PROTOBUF_VERSION
+    export PROTOBUF_VERSION_FULL
 
-PROTOBUF = libprotobuf32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(PROTOBUF)_SRC_PATH = $(SRC_PATH)/protobuf
-SONIC_MAKE_DEBS += $(PROTOBUF)
+    PROTOBUF = libprotobuf32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+    $(PROTOBUF)_SRC_PATH = $(SRC_PATH)/protobuf
+    SONIC_MAKE_DEBS += $(PROTOBUF)
 
-PROTOBUF_DEV = libprotobuf-dev_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(PROTOBUF_DEV)_DEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
-$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_DEV)))
+    PROTOBUF_DEV = libprotobuf-dev_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+    $(PROTOBUF_DEV)_DEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
+    $(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_DEV)))
 
-PROTOBUF_LITE = libprotobuf-lite32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_LITE)))
+    PROTOBUF_LITE = libprotobuf-lite32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+    $(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_LITE)))
 
-PROTOC32 = libprotoc32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(PROTOC32)_RDEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
-$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOC32)))
+    PROTOC32 = libprotoc32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+    $(PROTOC32)_RDEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
+    $(eval $(call add_derived_package,$(PROTOBUF),$(PROTOC32)))
 
-PROTOBUF_COMPILER = protobuf-compiler_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(PROTOBUF_COMPILER)_DEPENDS = $(PROTOC32)
-$(PROTOBUF_COMPILER)_RDEPENDS = $(PROTOC32)
-$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_COMPILER)))
+    PROTOBUF_COMPILER = protobuf-compiler_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+    $(PROTOBUF_COMPILER)_DEPENDS = $(PROTOC32)
+    $(PROTOBUF_COMPILER)_RDEPENDS = $(PROTOC32)
+    $(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_COMPILER)))
 
-PYTHON3_PROTOBUF = python3-protobuf_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(PYTHON3_PROTOBUF)_DEPENDS = $(PROTOBUF_DEV) $(PROTOBUF)
-$(PYTHON3_PROTOBUF)_RDEPENDS = $(PROTOBUF)
-$(eval $(call add_derived_package,$(PROTOBUF),$(PYTHON3_PROTOBUF)))
+    PYTHON3_PROTOBUF = python3-protobuf_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+    $(PYTHON3_PROTOBUF)_DEPENDS = $(PROTOBUF_DEV) $(PROTOBUF)
+    $(PYTHON3_PROTOBUF)_RDEPENDS = $(PROTOBUF)
+    $(eval $(call add_derived_package,$(PROTOBUF),$(PYTHON3_PROTOBUF)))
+
+endif

rules/sonic-dash-api.mk

@@ -5,8 +5,10 @@ LIB_SONIC_DASH_API_VERSION = 1.0.0
 LIB_SONIC_DASH_API = libdashapi_$(LIB_SONIC_DASH_API_VERSION)_$(CONFIGURED_ARCH).deb
 $(LIB_SONIC_DASH_API)_SRC_PATH = $(SRC_PATH)/sonic-dash-api
 
-$(LIB_SONIC_DASH_API)_DEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOBUF_DEV) $(PROTOBUF_COMPILER)
-$(LIB_SONIC_DASH_API)_RDEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PYTHON3_PROTOBUF)
+ifeq ($(BLDENV),bullseye)
+    $(LIB_SONIC_DASH_API)_DEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOBUF_DEV) $(PROTOBUF_COMPILER)
+    $(LIB_SONIC_DASH_API)_RDEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PYTHON3_PROTOBUF)
+endif
 
 SONIC_DPKG_DEBS += $(LIB_SONIC_DASH_API)
 

sonic-slave-bookworm/Dockerfile.j2

@@ -417,11 +417,8 @@ RUN apt-get update && apt-get install -y \
         libauparse-dev \
         auditd \
 # For protobuf
-        dh-elpa \
-        xmlto \
-        rake-compiler \
-        default-jdk \
-        libgoogle-gson-java
+        protobuf-compiler \
+        libprotobuf-dev
 
 {%- if CROSS_BUILD_ENVIRON == "y" %}
 # Arm vs. amd64 versions conflict - remove amd64 packages