Skip to content

Commit

Permalink
[Build]: Fix armhf 202111 build broken issue (#10423)
Browse files Browse the repository at this point in the history
* [Marvell] Update armhf SAI deb version 1.9.1 (#9865)

Move marvell armhf SAI deb to 1.9.1 to address build failures.

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>

* [Marvell] Update armhf driver/sai deb version (#10126)

Fixed Marvell SAI deb version naming issue reported in Marvell-switching/sonic-marvell-binaries#62

Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>

* [Build]: only install grpc in amd64 (#10212)

[Build]: only install grpc in amd64
Unblock marvell-armhf build.

Co-authored-by: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com>

Why I did it
Cherry-pick commits from master to 202111 to fix build broken issue.
See detail in the commits.
  • Loading branch information
xumia authored Apr 1, 2022
1 parent 00c13b4 commit 7ddad86
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
6 changes: 4 additions & 2 deletions files/build_templates/sonic_debian_extension.j2
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install psutil
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install ipaddr

# Install Python module for grpcio and grpcio-toole
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio==1.39.0"
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio-tools==1.39.0"
if [[ $CONFIGURED_ARCH == amd64 ]]; then
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio==1.39.0"
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio-tools==1.39.0"
fi

# Install SwSS SDK Python 3 package
# Note: the scripts will be overwritten by corresponding Python 2 package
Expand Down
2 changes: 1 addition & 1 deletion platform/marvell-armhf/prestera.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export MRVL_PRESTERA_VER = 1.0
export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH)
export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb
export MRVL_PRESTERA_SRC_URL = https://github.com/Marvell-switching/mrvl-prestera.git
export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.0
export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.2

$(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/prestera
$(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
Expand Down
3 changes: 1 addition & 2 deletions platform/marvell-armhf/sai.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Marvell SAI

export MRVL_SAI_VERSION = 1.8.1-1
export MRVL_SAI_VERSION = 1.9.1-1
export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
export MRVL_SAI_PACKAGE = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb

$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
$(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV)))
Expand Down
2 changes: 1 addition & 1 deletion platform/marvell-armhf/sai/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SHELL = /bin/bash
.SHELLFLAGS += -e

MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI_PACKAGE)
MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI)

$(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% :
# get deb package
Expand Down

0 comments on commit 7ddad86

Please sign in to comment.