[sonic-config-engine] Adding dependent pkgs needed for arm compilation (#6186)
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:
parent
3cd70b88b7
commit
9f4ca01388
@ -12,6 +12,10 @@ RUN apt-get update && \
|
||||
python-dev \
|
||||
python3-dev \
|
||||
apt-utils \
|
||||
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
|
||||
libxslt-dev \
|
||||
libz-dev \
|
||||
{%- endif %}
|
||||
python-setuptools \
|
||||
python3-setuptools
|
||||
|
||||
|
@ -10,6 +10,10 @@ RUN apt-get update && \
|
||||
build-essential \
|
||||
python-pip \
|
||||
python-dev \
|
||||
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
|
||||
libxslt-dev \
|
||||
libz-dev \
|
||||
{%- endif %}
|
||||
python-setuptools
|
||||
|
||||
RUN pip install --upgrade pip
|
||||
|
@ -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 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
|
||||
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
|
||||
|
@ -3,7 +3,7 @@
|
||||
NTP_VERSION = 4.2.8p12+dfsg
|
||||
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
|
||||
SONIC_MAKE_DEBS += $(NTP)
|
||||
SONIC_STRETCH_DEBS += $(NTP)
|
||||
|
@ -248,6 +248,9 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-sphinx \
|
||||
# For sonic config engine testing
|
||||
python-dev \
|
||||
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
|
||||
libxslt-dev \
|
||||
{%- endif %}
|
||||
# For lockfile
|
||||
procmail \
|
||||
# For gtest
|
||||
|
@ -244,6 +244,9 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-sphinx \
|
||||
# For sonic config engine testing
|
||||
python-dev \
|
||||
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
|
||||
libxslt-dev \
|
||||
{%- endif %}
|
||||
# For lockfile
|
||||
procmail \
|
||||
# For pam_tacplus build
|
||||
|
Loading…
Reference in New Issue
Block a user