Skip to content

Commit 037629c

Browse files
author
Myron Sosyak
committed
Bump Thrift version from 0.13.0 to 0.14.1
1 parent 9677401 commit 037629c

File tree

13 files changed

+322
-146
lines changed

13 files changed

+322
-146
lines changed

.gitmodules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,7 @@
9999
url = https://github.com/Azure/sonic-linkmgrd.git
100100
[submodule "src/sonic-p4rt/sonic-pins"]
101101
path = src/sonic-p4rt/sonic-pins
102-
url = https://github.com/Azure/sonic-pins.git
102+
url = https://github.com/Azure/sonic-pins.git
103+
[submodule "src/thrift_0_14_1/thrift"]
104+
path = src/thrift_0_14_1/thrift
105+
url = https://github.com/apache/thrift.git

platform/broadcom/libsaithrift-dev.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ LIBSAITHRIFT_DEV = libsaithrift$(SAITHRIFT_VER)-dev_$(SAI_VER)_amd64.deb
66
$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
77
#Support two different versions of thrift
88
ifeq ($(SAITHRIFT_V2),y)
9-
$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0)
10-
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0)
9+
$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_DEV_0_14_1) $(PYTHON3_THRIFT_0_14_1) $(THRIFT_COMPILER_0_14_1)
10+
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_14_1)
1111
$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2
1212
else
1313
$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)

rules/thrift_0_13_0.dep

Lines changed: 0 additions & 8 deletions
This file was deleted.

rules/thrift_0_13_0.mk

Lines changed: 0 additions & 17 deletions
This file was deleted.

rules/thrift_0_14_1.dep

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SPATH := $($(LIBTHRIFT_0_14_1)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/thrift_0_14_1.mk rules/thrift_0_14_1.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
DEP_FILES += $(shell git ls-files $(SPATH))
5+
6+
$(LIBTHRIFT_0_14_1)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(LIBTHRIFT_0_14_1)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(LIBTHRIFT_0_14_1)_DEP_FILES := $(DEP_FILES)

rules/thrift_0_14_1.mk

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# thrift package
2+
3+
THRIFT_0_14_1_VERSION = 0.14.1
4+
THRIFT_0_14_1_VERSION_FULL = $(THRIFT_0_14_1_VERSION)
5+
6+
LIBTHRIFT_0_14_1 = libthrift0_$(THRIFT_0_14_1_VERSION)_$(CONFIGURED_ARCH).deb
7+
$(LIBTHRIFT_0_14_1)_SRC_PATH = $(SRC_PATH)/thrift_0_14_1/thrift
8+
SONIC_DPKG_DEBS += $(LIBTHRIFT_0_14_1)
9+
10+
LIBTHRIFT_0_14_1_DEV = libthrift-dev_$(THRIFT_0_14_1_VERSION)_$(CONFIGURED_ARCH).deb
11+
$(eval $(call add_derived_package,$(LIBTHRIFT_0_14_1),$(LIBTHRIFT_0_14_1_DEV)))
12+
13+
PYTHON3_THRIFT_0_14_1 = python3-thrift_$(THRIFT_0_14_1_VERSION)_$(CONFIGURED_ARCH).deb
14+
$(eval $(call add_derived_package,$(LIBTHRIFT_0_14_1),$(PYTHON3_THRIFT_0_14_1)))
15+
16+
PYTHON_THRIFT_0_14_1 = python-thrift_$(THRIFT_0_14_1_VERSION)_$(CONFIGURED_ARCH).deb
17+
$(eval $(call add_derived_package,$(LIBTHRIFT_0_14_1),$(PYTHON_THRIFT_0_14_1)))
18+
19+
THRIFT_0_14_1_COMPILER = thrift-compiler_$(THRIFT_0_14_1_VERSION)_$(CONFIGURED_ARCH).deb
20+
$(eval $(call add_derived_package,$(LIBTHRIFT_0_14_1),$(THRIFT_0_14_1_COMPILER)))

src/thrift_0_13_0/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/thrift_0_13_0/Makefile

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/thrift_0_13_0/patch/0001-Remove-unneeded-packages.patch

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/thrift_0_14_1/thrift

Submodule thrift added at f6fa179

0 commit comments

Comments
 (0)