[dockers] Upgrade Mellanox syncd docker to stretch (#2640)
* [dockers] Upgrade Mellanox syncd docker to stretch Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
This commit is contained in:
Stepan Blyshchak
lguohan
parent
11c2e9ee3d
commit
8b7fc8db65
@ -35,6 +35,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
|
||||
cmake \
|
||||
libqt5core5a \
|
||||
libqt5network5 \
|
||||
libboost-atomic1.55.0 \
|
||||
less \
|
||||
git \
|
||||
iputils-ping \
|
||||
@ -43,7 +44,8 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
|
||||
tcpdump \
|
||||
python \
|
||||
python-dev \
|
||||
python-scapy
|
||||
python-scapy \
|
||||
python-six
|
||||
|
||||
RUN dpkg -i \
|
||||
{% for deb in docker_ptf_debs.split(' ') -%}
|
||||
|
||||
@ -8,6 +8,7 @@ $(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_MLNX)
|
||||
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
|
||||
ifeq ($(ENABLE_SYNCD_RPC),y)
|
||||
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
|
||||
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC)
|
||||
endif
|
||||
|
||||
$(DOCKER_SYNCD_MLNX_RPC)_CONTAINER_NAME = syncd
|
||||
|
||||
@ -4,10 +4,11 @@ DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz
|
||||
$(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx
|
||||
$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API)
|
||||
$(DOCKER_SYNCD_MLNX)_PYTHON_DEBS += $(MLNX_SFPD)
|
||||
$(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
|
||||
$(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
|
||||
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
|
||||
ifneq ($(ENABLE_SYNCD_RPC),y)
|
||||
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
|
||||
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX)
|
||||
endif
|
||||
|
||||
$(DOCKER_SYNCD_MLNX)_CONTAINER_NAME = syncd
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM docker-config-engine
|
||||
FROM docker-config-engine-stretch
|
||||
|
||||
ARG docker_container_name
|
||||
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# thrift package
|
||||
|
||||
THRIFT_VERSION = 0.9.3
|
||||
THRIFT_VERSION_FULL = $(THRIFT_VERSION)-2
|
||||
THRIFT_VERSION = 0.11.0
|
||||
THRIFT_VERSION_FULL = $(THRIFT_VERSION)-4
|
||||
|
||||
LIBTHRIFT = libthrift-$(THRIFT_VERSION)_$(THRIFT_VERSION_FULL)_amd64.deb
|
||||
$(LIBTHRIFT)_SRC_PATH = $(SRC_PATH)/thrift
|
||||
|
||||
@ -96,6 +96,7 @@ RUN apt-get update && apt-get install -y \
|
||||
libslf4j-java \
|
||||
libservlet3.1-java \
|
||||
qt5-default \
|
||||
pkg-php-tools \
|
||||
# For mellanox sdk build
|
||||
libpcre3 \
|
||||
libpcre3-dev \
|
||||
|
||||
@ -99,6 +99,7 @@ RUN apt-get update && apt-get install -y \
|
||||
libslf4j-java \
|
||||
libservlet3.1-java \
|
||||
qt5-default \
|
||||
pkg-php-tools \
|
||||
# For mellanox sdk build
|
||||
libpcre3 \
|
||||
libpcre3-dev \
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 501d16477a8ebd840f83867ad0d876b44188989c
|
||||
Subproject commit 81f557d07644953340ed081d1d66e3723f2be2f3
|
||||
@ -2,28 +2,26 @@ SHELL = /bin/bash
|
||||
.ONESHELL:
|
||||
.SHELLFLAGS += -e
|
||||
|
||||
THRIFT_VERSION = 0.9.3
|
||||
THRIFT_VERSION_FULL = $(THRIFT_VERSION)-2
|
||||
THRIFT_VERSION = 0.11.0
|
||||
THRIFT_VERSION_FULL = $(THRIFT_VERSION)-4
|
||||
|
||||
MAIN_TARGET = libthrift-$(THRIFT_VERSION)_$(THRIFT_VERSION_FULL)_amd64.deb
|
||||
DERIVED_TARGETS = libthrift-dev_$(THRIFT_VERSION_FULL)_amd64.deb \
|
||||
python-thrift_$(THRIFT_VERSION_FULL)_amd64.deb \
|
||||
thrift-compiler_$(THRIFT_VERSION_FULL)_amd64.deb
|
||||
|
||||
#THRIFT_LINK_PRE = http://http.debian.net/debian/pool/main/t/thrift
|
||||
THRIFT_LINK_PRE = https://sonicstorage.blob.core.windows.net/packages/debian
|
||||
|
||||
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
|
||||
rm -rf thrift-$(THRIFT_VERSION)
|
||||
|
||||
wget -NO "thrift_$(THRIFT_VERSION).orig.tar.gz" "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION).orig.tar.gz?sv=2015-04-05&sr=b&sig=wM3B01UnZQYYr7ZGXmCvRn6MMeS5hn5Oa5G5%2Btub53g%3D&se=2028-11-11T02%3A20%3A36Z&sp=r"
|
||||
wget -NO "thrift_$(THRIFT_VERSION_FULL).debian.tar.xz" "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).debian.tar.xz?sv=2015-04-05&sr=b&sig=76bx%2BN8uxYbuI%2BEq8uK%2B8cTKTzVmjtjsQ9weejWNINk%3D&se=2028-11-11T02%3A19%3A30Z&sp=r"
|
||||
wget -NO "thrift_$(THRIFT_VERSION_FULL).dsc" "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).dsc?sv=2015-04-05&sr=b&sig=Vpk1eJ97I5aWrtjAYS8w8AKyLXcJKFGIVFOOBGR3a5I%3D&se=2028-11-11T02%3A20%3A20Z&sp=r"
|
||||
wget -NO "thrift_$(THRIFT_VERSION).orig.tar.gz" "$(THRIFT_LINK_PRE)/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r"
|
||||
wget -NO "thrift_$(THRIFT_VERSION_FULL).debian.tar.xz" "$(THRIFT_LINK_PRE)/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r"
|
||||
wget -NO "thrift_$(THRIFT_VERSION_FULL).dsc" "$(THRIFT_LINK_PRE)/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r"
|
||||
|
||||
dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc
|
||||
pushd thrift-$(THRIFT_VERSION)
|
||||
patch -p1 < ../patch/THRIFT-3577-assertion-failed.patch
|
||||
DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
|
||||
CXXFLAGS="-DFORCE_BOOST_SMART_PTR" DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
|
||||
popd
|
||||
|
||||
mv $(DERIVED_TARGETS) $* $(DEST)/
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 9f96e358fb5bdac8a6570dc3c79e9416e4f407ce Mon Sep 17 00:00:00 2001
|
||||
From: Nobuaki Sukegawa <nsuke@apache.org>
|
||||
Date: Mon, 22 Feb 2016 01:33:27 +0900
|
||||
Subject: [PATCH] THRIFT-3577 assertion failed at line 512 of
|
||||
testcontainertest.c
|
||||
|
||||
---
|
||||
lib/c_glib/test/testcontainertest.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/c_glib/test/testcontainertest.c b/lib/c_glib/test/testcontainertest.c
|
||||
index 852254b..1cbc55c 100644
|
||||
--- a/lib/c_glib/test/testcontainertest.c
|
||||
+++ b/lib/c_glib/test/testcontainertest.c
|
||||
@@ -507,9 +507,9 @@ main(int argc, char *argv[])
|
||||
|
||||
/* Make sure the server stopped only because it was interrupted (by the
|
||||
child process terminating) */
|
||||
- g_assert (g_error_matches (error,
|
||||
- THRIFT_SERVER_SOCKET_ERROR,
|
||||
- THRIFT_SERVER_SOCKET_ERROR_ACCEPT));
|
||||
+ g_assert(!error || g_error_matches(error,
|
||||
+ THRIFT_SERVER_SOCKET_ERROR,
|
||||
+ THRIFT_SERVER_SOCKET_ERROR_ACCEPT));
|
||||
|
||||
/* Free our resources */
|
||||
g_object_unref (server);
|
||||
Reference in New Issue
Block a user