diff --git a/ubuntu_20.04-x86_64-coverity-linux-dpdk/Dockerfile b/ubuntu_20.04-x86_64-coverity-linux-dpdk/Dockerfile index cebf782..3d00d27 100644 --- a/ubuntu_20.04-x86_64-coverity-linux-dpdk/Dockerfile +++ b/ubuntu_20.04-x86_64-coverity-linux-dpdk/Dockerfile @@ -4,9 +4,7 @@ ARG COVERITY_TOKEN ENV COVERITY_PROJECT=ODP-DPDK -ENV DPDK_VERSION=v19.11.13 \ - RTE_ARCH=x86_64 \ - RTE_TARGET=x86_64-native-linuxapp-gcc +ENV DPDK_VERSION=v22.11.3 RUN apt-get update @@ -24,7 +22,6 @@ RUN apt-get install -yy \ clang \ curl \ gcc \ - gcc-10 \ git \ libcli-dev \ libconfig-dev \ @@ -33,22 +30,27 @@ RUN apt-get install -yy \ libpcap-dev \ libssl-dev \ libtool \ - libstdc++-10-dev \ make \ + meson \ + net-tools \ + ninja-build \ + python3-pip \ sudo +RUN pip3 install \ + pyelftools + RUN cd $HOME && \ git clone http://dpdk.org/git/dpdk-stable --branch ${DPDK_VERSION} --depth 1 ./dpdk && \ cd dpdk && \ - make config T=${RTE_TARGET} O=${RTE_TARGET} && \ - cd ${RTE_TARGET} && \ - sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"default",' .config && \ - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config && \ - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_OPENSSL=).*,\1y,' .config && \ - sed -ri 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config && \ - sed -ri 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config && \ - cd .. && \ - make -j $(nproc) install T=${RTE_TARGET} DESTDIR=/usr EXTRA_CFLAGS="-fPIC" && \ + meson setup build && \ + cd build && \ + meson configure -Dplatform=generic && \ + meson configure -Ddisable_apps=* && \ + meson configure -Dtests=false && \ + meson configure -Denable_drivers=crypto/*,dma/*,net/pcap && \ + ninja && \ + ninja install && \ cd $HOME && \ rm -r ./dpdk