Skip to content

Commit 9c7105b

Browse files
Install swsssdk-py3 in the base Debian image for python3 based apps (#4542)
Signed-off-by: Rajendra Dendukuri <[email protected]>
1 parent cde69ba commit 9c7105b

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

files/build_templates/sonic_debian_extension.j2

+8
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ sudo cp {{swsssdk_py2_wheel_path}} $FILESYSTEM_ROOT/$SWSSSDK_PY2_WHEEL_NAME
116116
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $SWSSSDK_PY2_WHEEL_NAME
117117
sudo rm -rf $FILESYSTEM_ROOT/$SWSSSDK_PY2_WHEEL_NAME
118118

119+
# Install SwSS SDK Python 3 package
120+
if [ -e {{swsssdk_py3_wheel_path}} ]; then
121+
SWSSSDK_PY3_WHEEL_NAME=$(basename {{swsssdk_py3_wheel_path}})
122+
sudo cp {{swsssdk_py3_wheel_path}} $FILESYSTEM_ROOT/$SWSSSDK_PY3_WHEEL_NAME
123+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SWSSSDK_PY3_WHEEL_NAME
124+
sudo rm -rf $FILESYSTEM_ROOT/$SWSSSDK_PY3_WHEEL_NAME
125+
fi
126+
119127
# Install sonic-yang-models py3 package, install dependencies
120128
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang_*.deb
121129
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libyang-cpp_*.deb

rules/sonic-ztp.mk

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ SONIC_ZTP_VERSION = 1.0.0
55

66
SONIC_ZTP = sonic-ztp_$(SONIC_ZTP_VERSION)_all.deb
77
$(SONIC_ZTP)_SRC_PATH = $(SRC_PATH)/sonic-ztp
8+
$(SONIC_ZTP)_WHEEL_DEPENDS += $(SWSSSDK_PY3)
89
SONIC_DPKG_DEBS += $(SONIC_ZTP)
910

1011
export SONIC_ZTP_VERSION

slave.mk

+1
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
813813
export installer_images="$(addprefix $(TARGET_PATH)/,$($*_DOCKERS))"
814814
export config_engine_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE))"
815815
export swsssdk_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY2))"
816+
export swsssdk_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY3))"
816817
export platform_common_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))"
817818
export redis_dump_load_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY2))"
818819
export install_debug_image="$(INSTALL_DEBUG_TOOLS)"

0 commit comments

Comments
 (0)