2017-03-10 3:47 GMT-08:00 Ian Stokes :
> DPDK now provides a stable release branch. Modify dpdk docs and travis linux
> build script to use the DPDK 16.11.1 stable branch to benefit from most
> recent bug fixes.
>
> Signed-off-by: Ian Stokes
Thanks, applied to master and branch-2.7
> ---
> v1 -> v2
> * Set correct path to DPDK stable branch for EXTRA_OPTS in travis linux
> build.
> ---
> .travis/linux-build.sh | 12 ++--
> Documentation/faq/releases.rst | 10 +-
> Documentation/intro/install/dpdk.rst |6 +++---
> Documentation/topics/dpdk/vhost-user.rst |8
> 4 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
> index 4175d72..8750d68 100755
> --- a/.travis/linux-build.sh
> +++ b/.travis/linux-build.sh
> @@ -52,13 +52,13 @@ function install_kernel()
> function install_dpdk()
> {
> if [ -n "$DPDK_GIT" ]; then
> -git clone $DPDK_GIT dpdk-$1
> -cd dpdk-$1
> -git checkout v$1
> +git clone $DPDK_GIT dpdk-stable-$1
> +cd dpdk-stable-$1
> +git checkout tags/v$1
> else
> wget http://fast.dpdk.org/rel/dpdk-$1.tar.gz
> tar xzvf dpdk-$1.tar.gz > /dev/null
> -cd dpdk-$1
> +cd dpdk-stable-$1
> fi
> find ./ -type f | xargs sed -i
> 's/max-inline-insns-single=100/max-inline-insns-single=400/'
> echo 'CONFIG_RTE_BUILD_FPIC=y' >>config/common_linuxapp
> @@ -80,14 +80,14 @@ fi
>
> if [ "$DPDK" ]; then
> if [ -z "$DPDK_VER" ]; then
> -DPDK_VER="16.11"
> +DPDK_VER="16.11.1"
> fi
> install_dpdk $DPDK_VER
> if [ "$CC" = "clang" ]; then
> # Disregard cast alignment errors until DPDK is fixed
> CFLAGS="$CFLAGS -Wno-cast-align"
> fi
> -EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=./dpdk-$DPDK_VER/build"
> +EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=./dpdk-stable-$DPDK_VER/build"
> elif [ "$CC" != "clang" ]; then
> # DPDK headers currently trigger sparse errors
> SPARSE_FLAGS="$SPARSE_FLAGS -Wsparse-error"
> diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
> index 118c88d..98f5636 100644
> --- a/Documentation/faq/releases.rst
> +++ b/Documentation/faq/releases.rst
> @@ -152,16 +152,16 @@ Q: What DPDK version does each Open vSwitch release
> work with?
> A: The following table lists the DPDK version against which the given
> versions of Open vSwitch will successfully build.
>
> - =
> + ===
> Open vSwitch DPDK
> - =
> + ===
> 2.2.x1.6
> 2.3.x1.6
> 2.4.x2.0
> 2.5.x2.2
> -2.6.x16.07
> -2.7.x16.11
> - =
> +2.6.x16.07.2
> +2.7.x16.11.1
> + ===
>
> Q: I get an error like this when I configure Open vSwitch::
>
> diff --git a/Documentation/intro/install/dpdk.rst
> b/Documentation/intro/install/dpdk.rst
> index 3018590..b947bd5 100644
> --- a/Documentation/intro/install/dpdk.rst
> +++ b/Documentation/intro/install/dpdk.rst
> @@ -64,9 +64,9 @@ Install DPDK
> #. Download the `DPDK sources`_, extract the file and set ``DPDK_DIR``::
>
> $ cd /usr/src/
> - $ wget http://fast.dpdk.org/rel/dpdk-16.11.tar.xz
> - $ tar xf dpdk-16.11.tar.xz
> - $ export DPDK_DIR=/usr/src/dpdk-16.11
> + $ wget http://fast.dpdk.org/rel/dpdk-16.11.1.tar.xz
> + $ tar xf dpdk-16.11.1.tar.xz
> + $ export DPDK_DIR=/usr/src/dpdk-stable-16.11.1
> $ cd $DPDK_DIR
>
> #. (Optional) Configure DPDK as a shared library
> diff --git a/Documentation/topics/dpdk/vhost-user.rst
> b/Documentation/topics/dpdk/vhost-user.rst
> index 5448bd2..ba22684 100644
> --- a/Documentation/topics/dpdk/vhost-user.rst
> +++ b/Documentation/topics/dpdk/vhost-user.rst
> @@ -278,9 +278,9 @@ To begin, instantiate a guest as described in
> :ref:`dpdk-vhost-user` or
> DPDK sources to VM and build DPDK::
>
> $ cd /root/dpdk/
> -$ wget http://fast.dpdk.org/rel/dpdk-16.11.tar.xz
> -$ tar xf dpdk-16.11.tar.xz
> -$ export DPDK_DIR=/root/dpdk/dpdk-16.11
> +$ wget http://fast.dpdk.org/rel/dpdk-16.11.1.tar.xz
> +$ tar xf dpdk-16.11.1.tar.xz
> +$ export DPDK_DIR=/root/dpdk/dpdk-stable-16.11.1
> $ export DPDK_TARGET=x86_64-native-linuxapp-gcc
> $ export DPDK_BUILD=$DPDK_DIR/$DPDK_TARGET
> $ cd $DPDK_DIR
> @@ -364,7 +364,7 @@ Sample XML
>
>
>
> -
> +
>
>
>
> --
> 1.7.0.7
>
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
___
dev mailing list
d...@openvswitch.org