Skip to content

Commit e28b48b

Browse files
PterosaurPterosaur
authored
[202311][submodule]: Update submodule sonic-swss/sonic-dash-api/protobuf (#17521)
* [submodule]: Update submodule sonic-swss/sonic-dash-api/protobuf (#17413) 1. Protobuf 3.21 has been released in the Debian bookworm 2. Update submodule sonic-swss and sonic-dash-api because they include related updates. - Microsoft ADO **(number only)**: 1. In the protobuf.mk, If it isn't bullseye, ignore to compile the protobuf package 2. Move sonic-swss commits: ``` fd852084 (HEAD, origin/master, origin/HEAD) [dashrouteorch]: Rename dash route namespace (#2966) ``` 3. Move sonic-dash-api and move build chain to its submodule ``` d4448c7 (HEAD, origin/master, origin/HEAD, master) [azp]: Add multi-platform artifacts (#11) 8a5e5cc [debian]: Add debian package (#10) d96163a [misc]: Add dash utils and its tests (#9) ``` Signed-off-by: Ze Gan <[email protected]>
1 parent 3d7459c commit e28b48b

13 files changed

+36
-111
lines changed

‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@
120120
[submodule "src/dhcpmon"]
121121
path = src/dhcpmon
122122
url = https://github.com/sonic-net/sonic-dhcpmon.git
123-
[submodule "src/sonic-dash-api/sonic-dash-api"]
124-
path = src/sonic-dash-api/sonic-dash-api
123+
[submodule "src/sonic-dash-api"]
124+
path = src/sonic-dash-api
125125
url = https://github.com/sonic-net/sonic-dash-api.git
126126
[submodule "platform/marvell-arm64/mrvl-prestera"]
127127
path = platform/marvell-arm64/mrvl-prestera

‎rules/protobuf.mk

+28-23
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,37 @@
11
# protobuf package
2+
# Protobuf 3.21.12 has been released in bookworm, So we only need to build it
3+
# in the bullseye environment.
4+
ifeq ($(BLDENV),bullseye)
25

3-
PROTOBUF_VERSION = 3.21.12
4-
PROTOBUF_VERSION_FULL = $(PROTOBUF_VERSION)-3
6+
PROTOBUF_VERSION = 3.21.12
7+
PROTOBUF_VERSION_FULL = $(PROTOBUF_VERSION)-3
58

6-
export PROTOBUF_VERSION
7-
export PROTOBUF_VERSION_FULL
9+
export PROTOBUF_VERSION
10+
export PROTOBUF_VERSION_FULL
811

9-
PROTOBUF = libprotobuf32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
10-
$(PROTOBUF)_SRC_PATH = $(SRC_PATH)/protobuf
11-
SONIC_MAKE_DEBS += $(PROTOBUF)
12+
PROTOBUF = libprotobuf32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
13+
$(PROTOBUF)_SRC_PATH = $(SRC_PATH)/protobuf
14+
SONIC_MAKE_DEBS += $(PROTOBUF)
1215

13-
PROTOBUF_DEV = libprotobuf-dev_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
14-
$(PROTOBUF_DEV)_DEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
15-
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_DEV)))
16+
PROTOBUF_DEV = libprotobuf-dev_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
17+
$(PROTOBUF_DEV)_DEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
18+
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_DEV)))
1619

17-
PROTOBUF_LITE = libprotobuf-lite32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
18-
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_LITE)))
20+
PROTOBUF_LITE = libprotobuf-lite32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
21+
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_LITE)))
1922

20-
PROTOC32 = libprotoc32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
21-
$(PROTOC32)_RDEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
22-
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOC32)))
23+
PROTOC32 = libprotoc32_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
24+
$(PROTOC32)_RDEPENDS = $(PROTOBUF) $(PROTOBUF_LITE)
25+
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOC32)))
2326

24-
PROTOBUF_COMPILER = protobuf-compiler_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
25-
$(PROTOBUF_COMPILER)_DEPENDS = $(PROTOC32)
26-
$(PROTOBUF_COMPILER)_RDEPENDS = $(PROTOC32)
27-
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_COMPILER)))
27+
PROTOBUF_COMPILER = protobuf-compiler_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
28+
$(PROTOBUF_COMPILER)_DEPENDS = $(PROTOC32)
29+
$(PROTOBUF_COMPILER)_RDEPENDS = $(PROTOC32)
30+
$(eval $(call add_derived_package,$(PROTOBUF),$(PROTOBUF_COMPILER)))
2831

29-
PYTHON3_PROTOBUF = python3-protobuf_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
30-
$(PYTHON3_PROTOBUF)_DEPENDS = $(PROTOBUF_DEV) $(PROTOBUF)
31-
$(PYTHON3_PROTOBUF)_RDEPENDS = $(PROTOBUF)
32-
$(eval $(call add_derived_package,$(PROTOBUF),$(PYTHON3_PROTOBUF)))
32+
PYTHON3_PROTOBUF = python3-protobuf_$(PROTOBUF_VERSION_FULL)_$(CONFIGURED_ARCH).deb
33+
$(PYTHON3_PROTOBUF)_DEPENDS = $(PROTOBUF_DEV) $(PROTOBUF)
34+
$(PYTHON3_PROTOBUF)_RDEPENDS = $(PROTOBUF)
35+
$(eval $(call add_derived_package,$(PROTOBUF),$(PYTHON3_PROTOBUF)))
36+
37+
endif

‎rules/sonic-dash-api.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ LIB_SONIC_DASH_API_VERSION = 1.0.0
55
LIB_SONIC_DASH_API = libdashapi_$(LIB_SONIC_DASH_API_VERSION)_$(CONFIGURED_ARCH).deb
66
$(LIB_SONIC_DASH_API)_SRC_PATH = $(SRC_PATH)/sonic-dash-api
77

8-
$(LIB_SONIC_DASH_API)_DEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOBUF_DEV) $(PROTOBUF_COMPILER)
9-
$(LIB_SONIC_DASH_API)_RDEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PYTHON3_PROTOBUF)
8+
ifeq ($(BLDENV),bullseye)
9+
$(LIB_SONIC_DASH_API)_DEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOBUF_DEV) $(PROTOBUF_COMPILER)
10+
$(LIB_SONIC_DASH_API)_RDEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PYTHON3_PROTOBUF)
11+
endif
1012

1113
SONIC_DPKG_DEBS += $(LIB_SONIC_DASH_API)
1214

‎src/sonic-dash-api

Submodule sonic-dash-api added at 910814f

‎src/sonic-dash-api/.gitignore

-2
This file was deleted.

‎src/sonic-dash-api/Makefile

-47
This file was deleted.

‎src/sonic-dash-api/debian/changelog

-6
This file was deleted.

‎src/sonic-dash-api/debian/compat

-1
This file was deleted.

‎src/sonic-dash-api/debian/control

-13
This file was deleted.

‎src/sonic-dash-api/debian/rules

-8
This file was deleted.

‎src/sonic-dash-api/pypkg/__init__.py

-5
This file was deleted.

‎src/sonic-dash-api/sonic-dash-api

-1
This file was deleted.

‎src/sonic-swss

0 commit comments

Comments
 (0)