> 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 <[email protected]> > Fixes: 5e925ccc2a6f ("netdev-dpdk: DPDK v17.11 upgrade") > Signed-off-by: Ilya Maximets <[email protected]> > --- > .travis/linux-build.sh | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index > ed28ee4..8fd9aa0 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"
Thanks for this Ilya, I like the idea of unifying the versions, will simplify future upgrades. This patch LGTM, I've tested with travis also and verified the fix. Rather than putting this as part of the next pull request on the dpdk_merge branch I think it makes sense to apply this to master ASAP if there are no objections? Acked-by: Ian Stokes <[email protected]> Tested-by: Ian Stokes <[email protected]> > -- > 2.7.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
