diff options
| author | Matias Elo <matias.elo@nokia.com> | 2020-02-11 15:37:45 +0200 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2020-02-26 14:13:48 +0200 |
| commit | f974cb930ffb6bc1f0084b23f8d2e877b75e44db (patch) | |
| tree | 725dffa8dee2b276e79ddf94991f69e9b38e59d8 /scripts | |
| parent | f1798c854568c4e521cf71842bb71e81a0904251 (diff) | |
travis: change default ubuntu container version to 18.04
Separate DPDK v18.11 test has been removed. DPDK v18.11 is used now by
default in Ubuntu 18.04 x86 builds. DPDK v17.11 is still used in Ubuntu
16.04 builds.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci/build_armhf.sh | 4 | ||||
| -rwxr-xr-x | scripts/ci/build_ppc64el.sh (renamed from scripts/ci/build_powerpc.sh) | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scripts/ci/build_armhf.sh b/scripts/ci/build_armhf.sh index 837561f83..c13acaa08 100755 --- a/scripts/ci/build_armhf.sh +++ b/scripts/ci/build_armhf.sh @@ -9,8 +9,10 @@ else export CC="${TARGET_ARCH}-gcc" export CXX="${TARGET_ARCH}-g++" fi -export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk" export CFLAGS="-march=armv7-a" export CXXFLAGS="-march=armv7-a" +# No DPDK on ARMv7 +export CONF="${CONF} --disable-dpdk" + exec "$(dirname "$0")"/build.sh diff --git a/scripts/ci/build_powerpc.sh b/scripts/ci/build_ppc64el.sh index a213ee1d3..ca094c901 100755 --- a/scripts/ci/build_powerpc.sh +++ b/scripts/ci/build_ppc64el.sh @@ -1,15 +1,16 @@ #!/bin/bash set -e -export TARGET_ARCH=powerpc-linux-gnu +export TARGET_ARCH=powerpc64le-linux-gnu if [ "${CC#clang}" != "${CC}" ] ; then export CC="clang --target=${TARGET_ARCH}" export CXX="clang++ --target=${TARGET_ARCH}" + # DPDK clang build broken + export CONF="${CONF} --disable-dpdk" else export CC="${TARGET_ARCH}-gcc" export CXX="${TARGET_ARCH}-g++" fi -# No DPDK on PowerPC -export CONF="${CONF} --disable-dpdk" +export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk" exec "$(dirname "$0")"/build.sh |