diff options
| author | Ilya Maximets <i.maximets@samsung.com> | 2017-12-12 11:32:39 +0300 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-12-13 09:33:16 -0800 |
| commit | 14ec9cab4612f57cfa552a926b09e69ddd2cbaff (patch) | |
| tree | 6556590b38ab81d54482257374d309362b4ec326 | |
| parent | 6625e434219d1c5b2c40af51825138be707b2af6 (diff) | |
| download | openvswitch-14ec9cab4612f57cfa552a926b09e69ddd2cbaff.tar.gz | |
travis: Unify DPDK build directory for stable/not stable releases.
Currently stable dpdk releases has 'dpdk-stable-$DPDK_VER' directory
in the tarball, but not stable has just 'dpdk-$DPDK_VER'.
This produces issues while moving from stable release to not stable
and vice versa. For example recent update to DPDK v17.11 broke the
travis build:
'dpdk-17.11.tar.gz' saved
./.travis/linux-build.sh: line 61:
cd: dpdk-stable-17.11: No such file or directory
With this change 'dpdk-$DPDK_VER' format will be used for all the
types of dpdk releases by renaming the source directory.
CC: Mark Kavanagh <mark.b.kavanagh@intel.com>
Fixes: 5e925ccc2a6f ("netdev-dpdk: DPDK v17.11 upgrade")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Ian Stokes <ian.stokes@intel.com>
Tested-by: Ian Stokes <ian.stokes@intel.com>
| -rwxr-xr-x | .travis/linux-build.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index ed28ee478..8fd9aa0f1 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -52,13 +52,15 @@ function install_kernel() function install_dpdk() { if [ -n "$DPDK_GIT" ]; then - git clone $DPDK_GIT dpdk-stable-$1 - cd dpdk-stable-$1 + git clone $DPDK_GIT dpdk-$1 + cd dpdk-$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-stable-$1 + DIR_NAME=$(tar -tf dpdk-$1.tar.gz | head -1 | cut -f1 -d"/") + if [ $DIR_NAME != "dpdk-$1" ]; then mv $DIR_NAME dpdk-$1; fi + cd dpdk-$1 fi find ./ -type f | xargs sed -i 's/max-inline-insns-single=100/max-inline-insns-single=400/' find ./ -type f | xargs sed -i 's/-Werror/-Werror -Wno-error=inline/' @@ -88,7 +90,7 @@ if [ "$DPDK" ]; then # Disregard cast alignment errors until DPDK is fixed CFLAGS="$CFLAGS -Wno-cast-align" fi - EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=./dpdk-stable-$DPDK_VER/build" + EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=./dpdk-$DPDK_VER/build" elif [ "$CC" != "clang" ]; then # DPDK headers currently trigger sparse errors SPARSE_FLAGS="$SPARSE_FLAGS -Wsparse-error" |