-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[submodule]: Update submodule sonic-swss/sonic-dash-api/protobuf (#17413
) ### Why I did it 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. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it 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) ``` #### How to verify it Check Azp
- Loading branch information
Showing
14 changed files
with
38 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule sonic-dash-api
added at
d4448c
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Submodule sonic-dash-api
deleted from
3f728d
Submodule sonic-swss
updated
4 files
+15 −0 | .azure-pipelines/build-docker-sonic-vs-template.yml | |
+15 −1 | .azure-pipelines/build-template.yml | |
+3 −2 | .azure-pipelines/docker-sonic-vs/Dockerfile | |
+2 −2 | orchagent/dash/dashrouteorch.h |