Skip to content

Commit

Permalink
Get rid of libboost-system VPP dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Rastislav Szabo <raszabo@cisco.com>
  • Loading branch information
rastislavs committed Apr 10, 2019
1 parent 404a6bf commit e994866
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 76 deletions.
2 changes: 1 addition & 1 deletion docker/vpp-vswitch/prod/vswitch/Dockerfile
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:18.04
RUN apt-get update \
&& apt-get install -y \
# vpp requirements
openssl libapr1 libnuma1 libmbedcrypto1 libmbedtls10 libmbedx509-0 libboost-system1.65.1 \
openssl libapr1 libnuma1 libmbedcrypto1 libmbedtls10 libmbedx509-0 \
# required for disabling TCP checksum offload in containers
ethtool \
# required for ipv6 services implementation
Expand Down
2 changes: 1 addition & 1 deletion docker/vpp-vswitch/prod/vswitch/Dockerfile.arm64
Expand Up @@ -3,7 +3,7 @@ FROM arm64v8/ubuntu:18.04
RUN apt-get update \
&& apt-get install -y \
# vpp requirements
openssl libapr1 libnuma1 libmbedcrypto1 libmbedtls10 libmbedx509-0 libboost-system1.65.1 \
openssl libapr1 libnuma1 libmbedcrypto1 libmbedtls10 libmbedx509-0 \
# required for disabling TCP checksum offload in containers
ethtool \
# required for ipv6 services implementation
Expand Down
7 changes: 5 additions & 2 deletions docker/vpp-vswitch/vpp/build-vpp.sh
Expand Up @@ -32,16 +32,19 @@ git reset --hard HEAD
cp ${VPP_PATCH_DIR}/*.diff . || true
git apply -v *.diff || true

# do not build vom
sed -i -e 's/vpp vom japi/vpp/g' build-data/platforms/vpp.mk
cat build-data/platforms/vpp.mk

if [ "$(uname -m)" = "aarch64" ] ; then
sed -i 's/lib\/x86_64-linux-gnu/lib\/aarch64-linux-gnu/g' build-data/platforms.mk
fi

# run the production build
UNATTENDED=y make vpp_configure_args_vpp='--disable-japi --disable-vom' install-dep
UNATTENDED=y make vpp_configure_args_vpp='--disable-japi --disable-vom' install-dep dpdk-install-dev
rm -rf /var/lib/apt/lists/*
cd ${VPP_DIR}
UNATTENDED=y make vpp_configure_args_vpp='--disable-japi --disable-vom' bootstrap dpdk-install-dev pkg-deb
UNATTENDED=y make vpp_configure_args_vpp='--disable-japi --disable-vom' build-release pkg-deb
cd build-root
rm -rf .ccache \
build-vpp-native/vpp/vpp-api/vom \
Expand Down
72 changes: 0 additions & 72 deletions docker/vpp-vswitch/vpp/patches/disable-vom-japi.diff

This file was deleted.

0 comments on commit e994866

Please sign in to comment.