summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorIan Stokes <ian.stokes@intel.com>2021-11-30 14:12:04 +0000
committerIan Stokes <ian.stokes@intel.com>2021-12-09 18:40:14 +0000
commit17346b3899d98730fc90f039a966b107aeae30b5 (patch)
tree3a896808a0168c91c6c99af83a61bbf8ca716a44 /.ci
parent72745ab0cdecf78ef5d1b487e3e030d9defe9114 (diff)
downloadopenvswitch-17346b3899d98730fc90f039a966b107aeae30b5.tar.gz
dpdk: Update to use DPDK v21.11.
This commit adds support for DPDK v21.11, it includes the following changes. 1. ci: Install python elftools for DPDK 21.02. 2. ci: Update meson requirement for DPDK 21.05. 3. netdev-dpdk: Fix build with 21.05. 4. ci: Compile DPDK in non developer mode. http://patchwork.ozlabs.org/project/openvswitch/list/?series=242480&state=* 5. netdev-dpdk: Remove access to DPDK internals. 6. netdev-dpdk: Remove unused attribute from rte_flow rule. 7. netdev-dpdk: Fix mbuf macros namespace with 21.11-rc1. 8. netdev-dpdk: Fix vhost namespace with 21.11-rc2. http://patchwork.ozlabs.org/project/openvswitch/list/?series=271159&state=* In addition documentation and DPDK unit tests were also updated in this commit for use with DPDK v21.11. For credit all authors of the original commits to 'dpdk-latest' with the above changes have been added as co-authors for this commit. Signed-off-by: David Marchand <david.marchand@redhat.com> Co-authored-by: David Marchand <david.marchand@redhat.com> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com> Tested-by: Emma Finn <emma.finn"intel.com> Tested-by: Seamus Ryan <seamus.ryan@intel.com> Acked-by: Kevin Traynor <ktraynor@redhat.com> Signed-off-by: Ian Stokes <ian.stokes@intel.com>
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/linux-build.sh6
-rwxr-xr-x.ci/linux-prepare.sh4
2 files changed, 7 insertions, 3 deletions
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 863f02388..ff6ae4b10 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -159,6 +159,10 @@ function install_dpdk()
# Disable building DPDK unit tests. Not needed for OVS build or tests.
DPDK_OPTS="$DPDK_OPTS -Dtests=false"
+ # Disable DPDK developer mode, this results in less build checks and less
+ # meson verbose outputs.
+ DPDK_OPTS="$DPDK_OPTS -Ddeveloper_mode=disabled"
+
# Install DPDK using prefix.
DPDK_OPTS="$DPDK_OPTS --prefix=$(pwd)/build"
@@ -216,7 +220,7 @@ fi
if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
if [ -z "$DPDK_VER" ]; then
- DPDK_VER="20.11.1"
+ DPDK_VER="21.11"
fi
install_dpdk $DPDK_VER
if [ "$CC" = "clang" ]; then
diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh
index 360c0a68e..b3addf404 100755
--- a/.ci/linux-prepare.sh
+++ b/.ci/linux-prepare.sh
@@ -21,8 +21,8 @@ make -j4 HAVE_LLVM= HAVE_SQLITE= install
cd ..
pip3 install --disable-pip-version-check --user \
- flake8 hacking sphinx wheel setuptools
-pip3 install --user 'meson==0.47.1'
+ flake8 hacking sphinx wheel setuptools pyelftools
+pip3 install --user 'meson==0.49.2'
if [ "$M32" ]; then
# Installing 32-bit libraries.