matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[sonic-config-engine] Adding dependent pkgs needed for arm compilation (#6186)

Browse Source 
libxslt-dev and libz-dev are dependencies for lxml==4.6.1 which is required for pyangbind==0.8.1

lxml-4.6.2-cp37-cp37m-manylinux1_x86_64.whl is directly downloaded in amd64 whereas in arm this is built from lxml-4.6.2.tar.gz

Signed-off-by: Sabareesh Kumar Anandan <sanandan@marvell.com>
This commit is contained in:
Sabareesh-Kumar-Anandan 2020-12-15 22:14:46 +05:30 committed by GitHub
parent 3cd70b88b7
commit 9f4ca01388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-config-engine-buster/Dockerfile.j2
View File

@ -12,6 +12,10 @@ RUN apt-get update && \
python-dev \ python-dev \
python3-dev \ python3-dev \
apt-utils \ apt-utils \
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
libxslt-dev \
libz-dev \
{%- endif %}
python-setuptools \ python-setuptools \
python3-setuptools python3-setuptools

4
dockers/docker-config-engine-stretch/Dockerfile.j2
View File

@ -10,6 +10,10 @@ RUN apt-get update && \
build-essential \ build-essential \
python-pip \ python-pip \
python-dev \ python-dev \
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
libxslt-dev \
libz-dev \
{%- endif %}
python-setuptools python-setuptools
RUN pip install --upgrade pip RUN pip install --upgrade pip

5
files/build_templates/sonic_debian_extension.j2
View File

@ -149,6 +149,11 @@ sudo cp {{sonic_py_common_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_PY_COMMON_PY3
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SONIC_PY_COMMON_PY3_WHEEL_NAME sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SONIC_PY_COMMON_PY3_WHEEL_NAME
sudo rm -rf $FILESYSTEM_ROOT/$SONIC_PY_COMMON_PY3_WHEEL_NAME sudo rm -rf $FILESYSTEM_ROOT/$SONIC_PY_COMMON_PY3_WHEEL_NAME
# Install dependency pkgs for SONiC config engine Python 2 package
if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libxslt-dev libz-dev
fi
# Install SONiC config engine Python 2 package # Install SONiC config engine Python 2 package
CONFIG_ENGINE_PY2_WHEEL_NAME=$(basename {{config_engine_py2_wheel_path}}) CONFIG_ENGINE_PY2_WHEEL_NAME=$(basename {{config_engine_py2_wheel_path}})
sudo cp {{config_engine_py2_wheel_path}} $FILESYSTEM_ROOT/$CONFIG_ENGINE_PY2_WHEEL_NAME sudo cp {{config_engine_py2_wheel_path}} $FILESYSTEM_ROOT/$CONFIG_ENGINE_PY2_WHEEL_NAME

2
rules/ntp.mk
View File

@ -3,7 +3,7 @@
NTP_VERSION = 4.2.8p12+dfsg NTP_VERSION = 4.2.8p12+dfsg
export NTP_VERSION export NTP_VERSION
NTP = ntp_$(NTP_VERSION)-4+deb10u2_amd64.deb NTP = ntp_$(NTP_VERSION)-4+deb10u2_$(CONFIGURED_ARCH).deb
$(NTP)_SRC_PATH = $(SRC_PATH)/ntp $(NTP)_SRC_PATH = $(SRC_PATH)/ntp
SONIC_MAKE_DEBS += $(NTP) SONIC_MAKE_DEBS += $(NTP)
SONIC_STRETCH_DEBS += $(NTP) SONIC_STRETCH_DEBS += $(NTP)

3
sonic-slave-buster/Dockerfile.j2
View File

@ -248,6 +248,9 @@ RUN apt-get update && apt-get install -y \
python3-sphinx \ python3-sphinx \
# For sonic config engine testing # For sonic config engine testing
python-dev \ python-dev \
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
libxslt-dev \
{%- endif %}
# For lockfile # For lockfile
procmail \ procmail \
# For gtest # For gtest

3
sonic-slave-stretch/Dockerfile.j2
View File

@ -244,6 +244,9 @@ RUN apt-get update && apt-get install -y \
python3-sphinx \ python3-sphinx \
# For sonic config engine testing # For sonic config engine testing
python-dev \ python-dev \
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
libxslt-dev \
{%- endif %}
# For lockfile # For lockfile
procmail \ procmail \
# For pam_tacplus build # For pam_tacplus build