[lng-odp] [PATCH v1 0/5] WIP: Travis: use Ubuntu 16.04 Docker image
This depends on Linaro/odp-docker-images#1 github /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: d8e7eaf6fa1b281c4ef9759cf7b64bfdd3b64c0b **/ /github checkpatch.pl total: 0 errors, 0 warnings, 0 checks, 68 lines checked to_send-p-000.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 447 lines checked to_send-p-001.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 27 lines checked to_send-p-002.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 11 lines checked to_send-p-003.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked to_send-p-004.patch has no obvious style problems and is ready for submission. /checkpatch.pl
[lng-odp] [PATCH v1 1/5] travis: drop LD variable override
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: d8e7eaf6fa1b281c4ef9759cf7b64bfdd3b64c0b **/ .travis.yml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1520aa1a..54586fa57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +75,10 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: -- if [ "${CC#clang}" != "${CC}" ] ; then LD="" CXX=clang++; fi +- if [ "${CC#clang}" != "${CC}" ] ; then CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; else @@ -94,7 +94,7 @@ script: echo "Running test" ; docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/build_x86_64.sh ; fi @@ -107,7 +107,7 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/coverage.sh - stage: test @@ -116,7 +116,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/distcheck.sh - stage: "build only" @@ -176,7 +176,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -185,7 +185,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -212,7 +212,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -221,7 +221,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test
[lng-odp] [PATCH v1 2/5] travis: switch to unified 16.04 image
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: d8e7eaf6fa1b281c4ef9759cf7b64bfdd3b64c0b **/ .travis.yml | 127 scripts/ci/build_arm64.sh | 50 -- scripts/ci/build_armhf.sh | 54 +-- scripts/ci/build_dpdk.sh| 88 - scripts/ci/build_i386.sh| 32 - scripts/ci/build_powerpc.sh | 33 -- scripts/ci/build_x86_64.sh | 32 +++-- 7 files changed, 90 insertions(+), 326 deletions(-) delete mode 100755 scripts/ci/build_dpdk.sh diff --git a/.travis.yml b/.travis.yml index 54586fa57..4c028566d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,16 +20,7 @@ stages: - "build only" - test -addons: -apt: -packages: -- gcc -- clang-3.8 -- automake autoconf libtool libssl-dev graphviz mscgen -- libconfig-dev -- codespell -- libpcap-dev -- libnuma-dev +#addons: #coverity_scan: #project: #name: "$TRAVIS_REPO_SLUG" @@ -42,9 +33,7 @@ cache: ccache: true pip: true directories: -- dpdk - netmap -- $HOME/cunit-install - $HOME/doxygen-install env: @@ -54,11 +43,18 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e -- DPDK_VERS="17.11.3" - if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi matrix: - CONF="" - CONF="--disable-abi-compat" +- CROSS_ARCH="arm64" +- CROSS_ARCH="armhf" +- CROSS_ARCH="powerpc" +- CROSS_ARCH="i386" +- CROSS_ARCH="arm64" CONF="--disable-abi-compat" +- CROSS_ARCH="armhf" CONF="--disable-abi-compat" +- CROSS_ARCH="powerpc" CONF="--disable-abi-compat" +- CROSS_ARCH="i386" CONF="--disable-abi-compat" - CONF="--enable-deprecated" - CONF="--enable-dpdk-zero-copy --disable-static-applications" - CONF="--disable-static-applications" @@ -66,7 +62,6 @@ env: - CONF="--disable-host-optimization --disable-abi-compat" - CONF="--enable-pcapng-support" - CONF="--without-openssl" -- DPDK_SHARED="y" CONF="--disable-static-applications" compiler: - gcc @@ -75,12 +70,11 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: -- if [ "${CC#clang}" != "${CC}" ] ; then CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp - -e CC="${CC}" -e CXX="${CXX}" - -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" - ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; + -e CC="${CC}" + -e CONF="${CONF}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; else echo "compilling netmap"; CDIR=`pwd` ; @@ -94,9 +88,9 @@ script: echo "Running test" ; docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e CXX="${CXX}" - -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" - ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/build_x86_64.sh ; + -e CC="${CC}" + -e CONF="${CONF}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_x86_64.sh ; fi jobs: include: @@ -107,21 +101,27 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" -e CXX="${CXX}" + -e CC="${CC}" -e CONF="${CONF}" - ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/coverage.sh + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/coverage.sh - stage: test env: TEST=distcheck compiler: gcc script: - docker run --privileged
[lng-odp] [PATCH v1 3/5] disable build only for now
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: d8e7eaf6fa1b281c4ef9759cf7b64bfdd3b64c0b **/ .travis.yml | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c028566d..8ccf9f97a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ language: c sudo: required dist: trusty -stages: - - "build only" - - test #addons: #coverity_scan: @@ -113,8 +110,7 @@ jobs: -e CC="${CC}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh -- stage: "build only" - env: TEST=doxygen +- env: TEST=doxygen compiler: gcc addons: apt: @@ -147,8 +143,7 @@ jobs: else true fi -- stage: "build only" - env: Ubuntu16.04_arm64 +- env: Ubuntu16.04_arm64 script: - docker run -i -t -v `pwd`:/odp -e CC="${CC}"
[lng-odp] [PATCH v1 5/5] travis: use correct dir for i686 dpdk includes
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: d8e7eaf6fa1b281c4ef9759cf7b64bfdd3b64c0b **/ scripts/ci/build_i386.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build_i386.sh b/scripts/ci/build_i386.sh index e6a744d26..f2e3536da 100755 --- a/scripts/ci/build_i386.sh +++ b/scripts/ci/build_i386.sh @@ -11,7 +11,7 @@ else export CXXFLAGS="-m32" export LDFLAGS="-m32" fi -export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk" +export CPPFLAGS="-I/usr/include/i386-linux-gnu/dpdk" cd "$(dirname "$0")"/../.. ./bootstrap
[lng-odp] [PATCH v1 4/5] m4: odp_dpdk: pass CFLAGS and LDFLAGS to CC when locating libdpdk.so
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: d8e7eaf6fa1b281c4ef9759cf7b64bfdd3b64c0b **/ m4/odp_dpdk.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 2ef5253c8..1072bf2dc 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -121,9 +121,9 @@ AC_DEFUN([ODP_DPDK], [dnl AS_IF([test "x$1" = "xsystem"], [dnl DPDK_CPPFLAGS="-isystem /usr/include/dpdk" DPDK_LDFLAGS="" -DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" +DPDK_LIB_PATH="`$CC $CFLAGS $LDFLAGS --print-file-name=libdpdk.so`" if test "$DPDK_LIB_PATH" = "libdpdk.so" ; then - DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" + DPDK_LIB_PATH="`$CC $CFLAGS $LDFLAGS --print-file-name=libdpdk.a`" AS_IF([test "$DPDK_LIB_PATH" = "libdpdk.a"], [AC_MSG_FAILURE([Could not locate system DPDK library directory])]) else
[lng-odp] [PATCH v2 0/6] WIP: Travis: use Ubuntu 16.04 Docker image
This depends on Linaro/odp-docker-images#1 github /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ /github checkpatch.pl total: 0 errors, 0 warnings, 0 checks, 68 lines checked to_send-p-000.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 447 lines checked to_send-p-001.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 27 lines checked to_send-p-002.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 11 lines checked to_send-p-003.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked to_send-p-004.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked to_send-p-005.patch has no obvious style problems and is ready for submission. /checkpatch.pl
[lng-odp] [PATCH v2 4/6] m4: odp_dpdk: pass CFLAGS and LDFLAGS to CC when locating libdpdk.so
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ m4/odp_dpdk.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 2ef5253c8..1072bf2dc 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -121,9 +121,9 @@ AC_DEFUN([ODP_DPDK], [dnl AS_IF([test "x$1" = "xsystem"], [dnl DPDK_CPPFLAGS="-isystem /usr/include/dpdk" DPDK_LDFLAGS="" -DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" +DPDK_LIB_PATH="`$CC $CFLAGS $LDFLAGS --print-file-name=libdpdk.so`" if test "$DPDK_LIB_PATH" = "libdpdk.so" ; then - DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" + DPDK_LIB_PATH="`$CC $CFLAGS $LDFLAGS --print-file-name=libdpdk.a`" AS_IF([test "$DPDK_LIB_PATH" = "libdpdk.a"], [AC_MSG_FAILURE([Could not locate system DPDK library directory])]) else
[lng-odp] [PATCH v2 1/6] travis: drop LD variable override
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ .travis.yml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1520aa1a..54586fa57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +75,10 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: -- if [ "${CC#clang}" != "${CC}" ] ; then LD="" CXX=clang++; fi +- if [ "${CC#clang}" != "${CC}" ] ; then CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; else @@ -94,7 +94,7 @@ script: echo "Running test" ; docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/build_x86_64.sh ; fi @@ -107,7 +107,7 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/coverage.sh - stage: test @@ -116,7 +116,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/distcheck.sh - stage: "build only" @@ -176,7 +176,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -185,7 +185,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -212,7 +212,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -221,7 +221,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test
[lng-odp] [PATCH v2 3/6] disable build only for now
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ .travis.yml | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c028566d..8ccf9f97a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ language: c sudo: required dist: trusty -stages: - - "build only" - - test #addons: #coverity_scan: @@ -113,8 +110,7 @@ jobs: -e CC="${CC}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh -- stage: "build only" - env: TEST=doxygen +- env: TEST=doxygen compiler: gcc addons: apt: @@ -147,8 +143,7 @@ jobs: else true fi -- stage: "build only" - env: Ubuntu16.04_arm64 +- env: Ubuntu16.04_arm64 script: - docker run -i -t -v `pwd`:/odp -e CC="${CC}"
[lng-odp] [PATCH v2 5/6] travis: use correct dir for i686 dpdk includes
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ scripts/ci/build_i386.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build_i386.sh b/scripts/ci/build_i386.sh index e6a744d26..f2e3536da 100755 --- a/scripts/ci/build_i386.sh +++ b/scripts/ci/build_i386.sh @@ -11,7 +11,7 @@ else export CXXFLAGS="-m32" export LDFLAGS="-m32" fi -export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk" +export CPPFLAGS="-I/usr/include/i386-linux-gnu/dpdk" cd "$(dirname "$0")"/../.. ./bootstrap
[lng-odp] [PATCH v2 6/6] travis: fix DOCKER_NAMESPACE variable setting
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ccf9f97a..a731e1a2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e -- if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi +- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi matrix: - CONF="" - CONF="--disable-abi-compat"
[lng-odp] [PATCH v2 2/6] travis: switch to unified 16.04 image
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e9bb9d25361eb56f5cb785ca4ff4800a9d64c449 **/ .travis.yml | 127 scripts/ci/build_arm64.sh | 50 -- scripts/ci/build_armhf.sh | 54 +-- scripts/ci/build_dpdk.sh| 88 - scripts/ci/build_i386.sh| 32 - scripts/ci/build_powerpc.sh | 33 -- scripts/ci/build_x86_64.sh | 32 +++-- 7 files changed, 90 insertions(+), 326 deletions(-) delete mode 100755 scripts/ci/build_dpdk.sh diff --git a/.travis.yml b/.travis.yml index 54586fa57..4c028566d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,16 +20,7 @@ stages: - "build only" - test -addons: -apt: -packages: -- gcc -- clang-3.8 -- automake autoconf libtool libssl-dev graphviz mscgen -- libconfig-dev -- codespell -- libpcap-dev -- libnuma-dev +#addons: #coverity_scan: #project: #name: "$TRAVIS_REPO_SLUG" @@ -42,9 +33,7 @@ cache: ccache: true pip: true directories: -- dpdk - netmap -- $HOME/cunit-install - $HOME/doxygen-install env: @@ -54,11 +43,18 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e -- DPDK_VERS="17.11.3" - if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi matrix: - CONF="" - CONF="--disable-abi-compat" +- CROSS_ARCH="arm64" +- CROSS_ARCH="armhf" +- CROSS_ARCH="powerpc" +- CROSS_ARCH="i386" +- CROSS_ARCH="arm64" CONF="--disable-abi-compat" +- CROSS_ARCH="armhf" CONF="--disable-abi-compat" +- CROSS_ARCH="powerpc" CONF="--disable-abi-compat" +- CROSS_ARCH="i386" CONF="--disable-abi-compat" - CONF="--enable-deprecated" - CONF="--enable-dpdk-zero-copy --disable-static-applications" - CONF="--disable-static-applications" @@ -66,7 +62,6 @@ env: - CONF="--disable-host-optimization --disable-abi-compat" - CONF="--enable-pcapng-support" - CONF="--without-openssl" -- DPDK_SHARED="y" CONF="--disable-static-applications" compiler: - gcc @@ -75,12 +70,11 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: -- if [ "${CC#clang}" != "${CC}" ] ; then CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp - -e CC="${CC}" -e CXX="${CXX}" - -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" - ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; + -e CC="${CC}" + -e CONF="${CONF}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; else echo "compilling netmap"; CDIR=`pwd` ; @@ -94,9 +88,9 @@ script: echo "Running test" ; docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e CXX="${CXX}" - -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" - ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/build_x86_64.sh ; + -e CC="${CC}" + -e CONF="${CONF}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_x86_64.sh ; fi jobs: include: @@ -107,21 +101,27 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" -e CXX="${CXX}" + -e CC="${CC}" -e CONF="${CONF}" - ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/coverage.sh + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/coverage.sh - stage: test env: TEST=distcheck compiler: gcc script: - docker run --privileged
[lng-odp] [PATCH v3 0/6] WIP: Travis: use Ubuntu 16.04 Docker image
This depends on Linaro/odp-docker-images#1 github /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ /github checkpatch.pl total: 0 errors, 0 warnings, 0 checks, 68 lines checked to_send-p-000.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 447 lines checked to_send-p-001.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 27 lines checked to_send-p-002.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 11 lines checked to_send-p-003.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked to_send-p-004.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 35 lines checked to_send-p-005.patch has no obvious style problems and is ready for submission. /checkpatch.pl
[lng-odp] [PATCH v3 1/6] travis: drop LD variable override
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ .travis.yml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1520aa1a..54586fa57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +75,10 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: -- if [ "${CC#clang}" != "${CC}" ] ; then LD="" CXX=clang++; fi +- if [ "${CC#clang}" != "${CC}" ] ; then CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; else @@ -94,7 +94,7 @@ script: echo "Running test" ; docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/build_x86_64.sh ; fi @@ -107,7 +107,7 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/coverage.sh - stage: test @@ -116,7 +116,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/distcheck.sh - stage: "build only" @@ -176,7 +176,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -185,7 +185,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -212,7 +212,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test @@ -221,7 +221,7 @@ jobs: script: - docker run --privileged -i -t -v `pwd`:/odp - -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" + -e CC="${CC}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05_i386 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; - stage: test
[lng-odp] [PATCH v3 6/6] travis: fix DOCKER_NAMESPACE variable setting
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ccf9f97a..647704553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,6 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e -- if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi matrix: - CONF="" - CONF="--disable-abi-compat" @@ -67,6 +66,7 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: +- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp -e CC="${CC}" @@ -95,6 +95,7 @@ jobs: env: TEST=coverage compiler: gcc script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" @@ -105,6 +106,7 @@ jobs: env: TEST=distcheck compiler: gcc script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CC="${CC}" @@ -145,6 +147,7 @@ jobs: fi - env: Ubuntu16.04_arm64 script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run -i -t -v `pwd`:/odp -e CC="${CC}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_arm64.sh
[lng-odp] [PATCH v3 3/6] disable build only for now
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ .travis.yml | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c028566d..8ccf9f97a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ language: c sudo: required dist: trusty -stages: - - "build only" - - test #addons: #coverity_scan: @@ -113,8 +110,7 @@ jobs: -e CC="${CC}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh -- stage: "build only" - env: TEST=doxygen +- env: TEST=doxygen compiler: gcc addons: apt: @@ -147,8 +143,7 @@ jobs: else true fi -- stage: "build only" - env: Ubuntu16.04_arm64 +- env: Ubuntu16.04_arm64 script: - docker run -i -t -v `pwd`:/odp -e CC="${CC}"
[lng-odp] [PATCH v3 5/6] travis: use correct dir for i686 dpdk includes
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ scripts/ci/build_i386.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build_i386.sh b/scripts/ci/build_i386.sh index e6a744d26..f2e3536da 100755 --- a/scripts/ci/build_i386.sh +++ b/scripts/ci/build_i386.sh @@ -11,7 +11,7 @@ else export CXXFLAGS="-m32" export LDFLAGS="-m32" fi -export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk" +export CPPFLAGS="-I/usr/include/i386-linux-gnu/dpdk" cd "$(dirname "$0")"/../.. ./bootstrap
[lng-odp] [PATCH v3 2/6] travis: switch to unified 16.04 image
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ .travis.yml | 127 scripts/ci/build_arm64.sh | 50 -- scripts/ci/build_armhf.sh | 54 +-- scripts/ci/build_dpdk.sh| 88 - scripts/ci/build_i386.sh| 32 - scripts/ci/build_powerpc.sh | 33 -- scripts/ci/build_x86_64.sh | 32 +++-- 7 files changed, 90 insertions(+), 326 deletions(-) delete mode 100755 scripts/ci/build_dpdk.sh diff --git a/.travis.yml b/.travis.yml index 54586fa57..4c028566d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,16 +20,7 @@ stages: - "build only" - test -addons: -apt: -packages: -- gcc -- clang-3.8 -- automake autoconf libtool libssl-dev graphviz mscgen -- libconfig-dev -- codespell -- libpcap-dev -- libnuma-dev +#addons: #coverity_scan: #project: #name: "$TRAVIS_REPO_SLUG" @@ -42,9 +33,7 @@ cache: ccache: true pip: true directories: -- dpdk - netmap -- $HOME/cunit-install - $HOME/doxygen-install env: @@ -54,11 +43,18 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e -- DPDK_VERS="17.11.3" - if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi matrix: - CONF="" - CONF="--disable-abi-compat" +- CROSS_ARCH="arm64" +- CROSS_ARCH="armhf" +- CROSS_ARCH="powerpc" +- CROSS_ARCH="i386" +- CROSS_ARCH="arm64" CONF="--disable-abi-compat" +- CROSS_ARCH="armhf" CONF="--disable-abi-compat" +- CROSS_ARCH="powerpc" CONF="--disable-abi-compat" +- CROSS_ARCH="i386" CONF="--disable-abi-compat" - CONF="--enable-deprecated" - CONF="--enable-dpdk-zero-copy --disable-static-applications" - CONF="--disable-static-applications" @@ -66,7 +62,6 @@ env: - CONF="--disable-host-optimization --disable-abi-compat" - CONF="--enable-pcapng-support" - CONF="--without-openssl" -- DPDK_SHARED="y" CONF="--disable-static-applications" compiler: - gcc @@ -75,12 +70,11 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: -- if [ "${CC#clang}" != "${CC}" ] ; then CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp - -e CC="${CC}" -e CXX="${CXX}" - -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" - ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; + -e CC="${CC}" + -e CONF="${CONF}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${CROSS_ARCH}.sh ; else echo "compilling netmap"; CDIR=`pwd` ; @@ -94,9 +88,9 @@ script: echo "Running test" ; docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g - -e CC="${CC}" -e CXX="${CXX}" - -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" - ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/build_x86_64.sh ; + -e CC="${CC}" + -e CONF="${CONF}" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_x86_64.sh ; fi jobs: include: @@ -107,21 +101,27 @@ jobs: - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" - -e CC="${CC}" -e CXX="${CXX}" + -e CC="${CC}" -e CONF="${CONF}" - ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/coverage.sh + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/coverage.sh - stage: test env: TEST=distcheck compiler: gcc script: - docker run --privileged
[lng-odp] [PATCH v3 4/6] m4: odp_dpdk: pass CFLAGS and LDFLAGS to CC when locating libdpdk.so
From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 681 (lumag:travis-xenial) ** https://github.com/Linaro/odp/pull/681 ** Patch: https://github.com/Linaro/odp/pull/681.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156 **/ m4/odp_dpdk.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 2ef5253c8..1072bf2dc 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -121,9 +121,9 @@ AC_DEFUN([ODP_DPDK], [dnl AS_IF([test "x$1" = "xsystem"], [dnl DPDK_CPPFLAGS="-isystem /usr/include/dpdk" DPDK_LDFLAGS="" -DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" +DPDK_LIB_PATH="`$CC $CFLAGS $LDFLAGS --print-file-name=libdpdk.so`" if test "$DPDK_LIB_PATH" = "libdpdk.so" ; then - DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" + DPDK_LIB_PATH="`$CC $CFLAGS $LDFLAGS --print-file-name=libdpdk.a`" AS_IF([test "$DPDK_LIB_PATH" = "libdpdk.a"], [AC_MSG_FAILURE([Could not locate system DPDK library directory])]) else
[lng-odp] [PATCH v1 0/1] travis: fix DOCKER_NAMESPACE variable setting
First, original commit missed one quote mark. Second, conditional ifs do not work in env: part of .travis.yml. Set DOCKER_NAMESPACE properly. Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsoleni...@linaro.org Fixes: 989df5d github /** Email created from pull request 684 (lumag:docker-ns-fix) ** https://github.com/Linaro/odp/pull/684 ** Patch: https://github.com/Linaro/odp/pull/684.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e3810b543a5dd8cc9bdef2b98f0d6f696b6e6194 **/ /github checkpatch.pl total: 0 errors, 0 warnings, 0 checks, 63 lines checked to_send-p-000.patch has no obvious style problems and is ready for submission. /checkpatch.pl
[lng-odp] [PATCH v1 1/1] travis: fix DOCKER_NAMESPACE variable setting
From: Dmitry Eremin-Solenikov First, original commit missed one quote mark. Second, conditional ifs do not work in env: part of .travis.yml. Set DOCKER_NAMESPACE properly. Signed-off-by: Dmitry Eremin-Solenikov Fixes: 989df5d2f97ab4711328b11282dcc743f5740e00 --- /** Email created from pull request 684 (lumag:docker-ns-fix) ** https://github.com/Linaro/odp/pull/684 ** Patch: https://github.com/Linaro/odp/pull/684.patch ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00 ** Merge commit sha: e3810b543a5dd8cc9bdef2b98f0d6f696b6e6194 **/ .travis.yml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1520aa1a..23629d538 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,6 @@ env: # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - DPDK_VERS="17.11.3" -- if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi matrix: - CONF="" - CONF="--disable-abi-compat" @@ -75,6 +74,7 @@ compiler: install: - sudo apt-get install linux-headers-`uname -r` script: +- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - if [ "${CC#clang}" != "${CC}" ] ; then LD="" CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then docker run -i -t -v `pwd`:/odp @@ -104,6 +104,7 @@ jobs: env: TEST=coverage compiler: gcc script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" @@ -114,6 +115,7 @@ jobs: env: TEST=distcheck compiler: gcc script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp --shm-size 8g -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" @@ -150,6 +152,7 @@ jobs: - stage: "build only" env: Ubuntu14.04_arm64 script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run -i -t -v `pwd`:/odp ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_arm64.sh - stage: test @@ -174,6 +177,7 @@ jobs: compiler: gcc env: CROSS_ARCH="i386" script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" @@ -183,6 +187,7 @@ jobs: compiler: clang env: CROSS_ARCH="i386" script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" @@ -210,6 +215,7 @@ jobs: compiler: gcc env: CROSS_ARCH="i386" CONF="--disable-abi-compat" script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" @@ -219,6 +225,7 @@ jobs: compiler: clang env: CROSS_ARCH="i386" CONF="--disable-abi-compat" script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi - docker run --privileged -i -t -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}"