diff options
| -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" |