Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 9 commits into from
Dec 6, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fce90a8
disable buster
Pterosaur Nov 22, 2023
dbfb7b1
Swss import dashapi
Pterosaur Nov 25, 2023
3b65264
Merge branch 'master' into dpu_db_cli
Pterosaur Nov 26, 2023
922c824
Update dash-api submodule
Pterosaur Dec 3, 2023
f46b55f
Adapt for bookworm
Pterosaur Dec 3, 2023
8e2a877
Update sonic-dash-api
Pterosaur Dec 3, 2023
5ca118c
Update sonic-swss submodule
Pterosaur Dec 5, 2023
14f0948
Revert swss-common.mk
Pterosaur Dec 5, 2023
d3c48b2
Merge branch 'master' into update_dash_and_swss
Pterosaur Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
51 changes: 28 additions & 23 deletions rules/protobuf.mk
View file
Open in desktop
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
6 changes: 4 additions & 2 deletions rules/sonic-dash-api.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 2 additions & 5 deletions sonic-slave-bookworm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/sonic-dash-api
Open in desktop
Submodule sonic-dash-api added at d4448c
2 changes: 0 additions & 2 deletions src/sonic-dash-api/.gitignore
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions src/sonic-dash-api/Makefile
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/sonic-dash-api/debian/changelog
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/sonic-dash-api/debian/compat
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/sonic-dash-api/debian/control
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/sonic-dash-api/debian/rules
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/sonic-dash-api/pypkg/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/sonic-dash-api/sonic-dash-api
Open in desktop
Submodule sonic-dash-api deleted from 3f728d
2 changes: 1 addition & 1 deletion src/sonic-swss
Open in desktop
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