From patchwork Thu Jan 18 23:00:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125054 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp33421ljf; Thu, 18 Jan 2018 15:01:53 -0800 (PST) X-Google-Smtp-Source: ACJfBos6dzj5ykXP2nR5q8wAV6u3tPZvL5/smzgYqR4tnQhHpqZA+8Rb8lfwR9kqCz8bb10XElec X-Received: by 10.55.103.88 with SMTP id b85mr35588618qkc.182.1516316513195; Thu, 18 Jan 2018 15:01:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316513; cv=none; d=google.com; s=arc-20160816; b=vTQ4f/HQ5o7wdF3VSRAY9oWfpCk/mR8WjvtxNsjWClB6QFFmu1f3tECxxn8Xi7zsr2 mkHleQZ36KqKDV2c4byy4563dgZjNbzZAhf+KvHJwT3/k1UJ0vnTRwKAe03zR05nWQfx V+K5iRblBoHNrgS44MS7xelvVriaDcu8FVpTvbmdbDV89WIAw81NAgNxkgen0kb50kgh g/jB7siZdRhEnuiqQuKK6jmkkpM6WS+tyhGazjSmOFZANdZ6EO+7G+u/ZnZttfP8j+LA VtMQYuPO3HpDMaEcNBRpIxFgQ0wU5Dkj/2BUyLvCgh+lXV44GCMStfev7L9d4av7tKjn aFFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=ckMcrIKyNjqyAYwlOy1RlNKPAXJqe29WtWgPiqLAO0Q=; b=YQaclHk/3Koou8k8m39nflsCb2maavoHtJLGf+C2URdo1JmkSE7qxzg2vZatB50NwW 8cxM6+KkXc2OiJIgbTtrX/CS3QfzY0lvRM4EoRxwsQoMIszXwXqvj3ygrxsye9lcbFJQ onUkFYUUV3E8dYyR9AXf2Z8UEM7l9+z7jQKnsGO/LyDaDoS4px5/VDFDRZLG7hM5tPWt 7yZxsCBWyldWwhLEZZHirkR+eP/8XPGNzf6VIUCOJSvfsPFDuEi1GAD5GEOEec9kFo0F BN0BeAO8OCF+6pKvYB3g2R+vmK8Vb4d1/B+eJC1Tx9fPltxQn5IIweoiESMs6lexPOJL J6vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id s5si469517qtj.27.2018.01.18.15.01.52; Thu, 18 Jan 2018 15:01:53 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id DB30961795; Thu, 18 Jan 2018 23:01:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 591BB6171B; Thu, 18 Jan 2018 23:01:47 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9F6FD6172F; Thu, 18 Jan 2018 23:01:44 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id C55D16171B for ; Thu, 18 Jan 2018 23:01:42 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 6FF3B6A83C72 for ; Fri, 19 Jan 2018 02:01:41 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id EJ6MHMFmyR-1fX8DGgI; Fri, 19 Jan 2018 02:01:41 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-0xqSEQpo; Fri, 19 Jan 2018 02:00:59 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:15 +0300 Message-Id: <1516316420-16628-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 1/6] travis: stop early when installation of cross-packages has failed X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov If installation of cross-packages fails, installation will abort with obscure error message. Stop early providing more precise "error" point. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b614668c5..39dbb5865 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,15 +97,15 @@ before_install: sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; sudo -E apt-get -y update || true ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential || exit 1; if [ "$CROSS_ARCH" = "i386" ] ; then - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib || exit 1; else - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" || exit 1; fi ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" ; - [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH"; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" || exit 1; + [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH" || exit 1; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi - if [ "${CC#clang}" != "${CC}" ] ; From patchwork Thu Jan 18 23:00:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125055 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp33676ljf; Thu, 18 Jan 2018 15:02:34 -0800 (PST) X-Google-Smtp-Source: ACJfBovGhkxZlhL35CYDeIFl45AwH12ehubWGpFYYvG0KQtanUB1T6LYhdmzUceH9lZhLNaqbYM6 X-Received: by 10.200.34.91 with SMTP id p27mr20895290qtp.117.1516316554496; Thu, 18 Jan 2018 15:02:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316554; cv=none; d=google.com; s=arc-20160816; b=igEkVV12Y0fdIedOdaaT1IdGVpQ2ZRRzLjOWeG8gyvidaUy1eoj2LFKjf+gzx/8vKC jJnNRYZbWmBxI7la8g2o+6zRnGOYWEtc/UI6wgyYs+GC9/S93oZKcPkpI/a9yL4CVhzz yL4WLJ8KQ8AhEy+2N8uxkRNhEV9Si/adXpiCrhOE75SleKZwwcFtV+nVbL1Mx7BRXxzP XU0NWoM+pGSgJPFeO6NWNPuNw7PSRc/LsL1StejznO+LpfrnPxYBLw4ZzT9kIkpEo4Fi 8Cu6327rLH72ZdmSG3DYPmq+0sFcMCdtU9zybRtPv2yuEiyIFHKhggBco+F1zE5mTE7B L4qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=OrsYyVKLFPXfOkLyrKg6qNIpT6IJ47Lc1t5QF78oLKY=; b=JH7JWhQXQnG9vvYmyPpb64smAGWk8byFOBEpVn+B/x2fu8JpWv4pFlhsXeEvwrZXhE pDCeDb5flMGzCbxOshZ0Pa/s1yEAnQcaMOYScDn6lnwrOnvGrLBYZsTxJ1exj4Y6OSiQ 7SuSEeQwpTA6ZcAGdC/3UUGBYnHhxoiwl04NUv0NvuVnbVYprRwOhTp6ErOYGnXevqw/ D/LJ2DJiiRN0OfSpCNhjRDM3b3flC1ntQ/ZFkKdfwXZNDYkFfHylU5XR9Kc9X16nzdBc AvHU/nRhmCXGswp8S5HuFbukT2xt14Q3zigGo2Pqqo4lx7wmUnu5x1EFq98xlXqkPc23 d81g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id v20si1959470qta.200.2018.01.18.15.02.34; Thu, 18 Jan 2018 15:02:34 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 1EF5D617D2; Thu, 18 Jan 2018 23:02:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 5B8EB61765; Thu, 18 Jan 2018 23:02:29 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A5E086152B; Thu, 18 Jan 2018 23:02:25 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 3291D6152B for ; Thu, 18 Jan 2018 23:01:50 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 07A092180DE9 for ; Fri, 19 Jan 2018 02:01:48 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id B0oIiYV7G4-1lmC084B; Fri, 19 Jan 2018 02:01:48 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-1fqC13mq; Fri, 19 Jan 2018 02:01:41 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:16 +0300 Message-Id: <1516316420-16628-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 2/6] travis: compile doxygen only for doxygen test X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov All other tests do not use doxygen. So let's compile doxygen only for doxygen test, saving few minutes. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ .travis.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39dbb5865..df942de59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,18 +156,6 @@ before_install: - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install - # Updated Doxygen - - | - if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then - wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz - tar xpvf Release_1_8_13.tar.gz - pushd doxygen-Release_1_8_13 - cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . - make install - popd - fi - - export PATH=$HOME/doxygen-install/bin:$PATH - install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages @@ -310,7 +298,17 @@ jobs: env: TEST=doxygen compiler: gcc install: - - true + # Updated Doxygen + - | + if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then + wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz + tar xpvf Release_1_8_13.tar.gz + pushd doxygen-Release_1_8_13 + cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make install + popd + fi + - export PATH=$HOME/doxygen-install/bin:$PATH script: - ./bootstrap - ./configure From patchwork Thu Jan 18 23:00:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125057 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp34077ljf; Thu, 18 Jan 2018 15:03:51 -0800 (PST) X-Google-Smtp-Source: AH8x225oSXjNTlSlQ7Lvb/W/eeKMTR2cyZDOmyDSOB1kJwwxSQxw7+ZfIgueBZNGJogCo6WBYHYV X-Received: by 10.237.49.9 with SMTP id 9mr4277448qtg.147.1516316631224; Thu, 18 Jan 2018 15:03:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316631; cv=none; d=google.com; s=arc-20160816; b=Gmnxa/hQkkbdWDwvY2HPHWMmiclwgeF4yKy6xaXjCJAgQO6WTcyPCKlqv0TGdKoGdy Mv/uDdfmyssYK7g3RGOw1bNmzd2Yy8uusC8972Is7kDrKJPbs+aCqnxqF63Sp4U2FjBt kQoqHm+TKJsShMmu3WHxzW6EMIzwSFqnDErIWvi8CJpu7WE4G+yR0AeUVNjqHxzZvkam UGgb1YAqq92hy//y+9gbwV5h7EPqhacr0ELE8DB2Ze8qY7CwsdNKs1xJWYOCS9nzCW+G 8KybxM/SE9UBKjKTz1/kynQvx2u3kyD5zvuZ0qEtTi2Q8BY2nBh0/5T5EZg6iabYgSkw wWSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=6nTV802aayxVTn7eaKVfMHBRCv/VYt8hoVgyCFK7C6g=; b=Vi+ECTTC0G9Fbxdj8p7qNkKTrMmqbCj1wO5gYuZbfMciOoQUoHUOCfUG4JruIMcNW0 /b1pDcsyDfDFSfrpAGyOj3kq6GOysbJhuVKMyiD0GLBKrdCV7U+lc4yBXQjGiuvQJ8PM x3c96bNwxPGiy84HCOPJtS2HCqarzrCCjc+p7aAn/SqP3iZ/j5LJDeB78byHbhYQo34I GtYKepAX8GcAOyVijDdtpKEH/uCs1GN9U1FvaJF9PCTZDmiYgT1faQHiSKXDgk4Mp1dZ 2t3AWUEkMXH8O88EudQg/HesNl7aUEXpG5He8uqt/jH7801pFgKMPm7tF/na3wDfCrSm vjUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 131si2539287qkh.482.2018.01.18.15.03.42; Thu, 18 Jan 2018 15:03:51 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id E970F617B0; Thu, 18 Jan 2018 23:03:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 36F1A617CF; Thu, 18 Jan 2018 23:02:37 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E931C6171B; Thu, 18 Jan 2018 23:02:26 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 4FF406171B for ; Thu, 18 Jan 2018 23:01:56 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 03D2D181331 for ; Fri, 19 Jan 2018 02:01:55 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FMDWKP9xAM-1sb8jmLl; Fri, 19 Jan 2018 02:01:54 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-1mq8qFGc; Fri, 19 Jan 2018 02:01:48 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:17 +0300 Message-Id: <1516316420-16628-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 3/6] travis: use parallel make for all builds X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Use parallel make to build everything, speeding up builds. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index df942de59..cd571f4f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,7 +149,7 @@ before_install: automake --add-missing --include-deps --copy autoconf ./configure --prefix=$HOME/cunit-install/$CROSS_ARCH --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log - make + make -j $(nproc) sudo make install popd fi @@ -214,7 +214,7 @@ install: sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config fi popd - make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" + make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" @@ -227,7 +227,7 @@ install: git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git pushd netmap/LINUX ./configure - make + make -j $(nproc) popd fi sudo insmod ./netmap/LINUX/netmap.ko @@ -276,6 +276,7 @@ jobs: CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full --enable-helper-linux + - CCACHE_DISABLE=1 make -j $(nproc) - sudo CCACHE_DISABLE=1 LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test @@ -305,6 +306,7 @@ jobs: tar xpvf Release_1_8_13.tar.gz pushd doxygen-Release_1_8_13 cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make -j $(nproc) make install popd fi @@ -337,7 +339,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux - - make + - make -j $(nproc) - stage: "build only" env: CONF="" compiler: clang-3.8 @@ -345,7 +347,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux - - make + - make -j $(nproc) - stage: "build only" env: CROSS_ARCH="i386" compiler: gcc @@ -353,7 +355,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux $CROSS - - make + - make -j $(nproc) - stage: "build only" env: CROSS_ARCH="arm64" compiler: gcc @@ -361,7 +363,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux $CROSS - - make + - make -j $(nproc) after_failure: - cat config.log From patchwork Thu Jan 18 23:00:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125056 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp33860ljf; Thu, 18 Jan 2018 15:03:11 -0800 (PST) X-Google-Smtp-Source: ACJfBouea8tmuuRttcGbHILWAUit15iHT+q94P1fbnDJLhPLz25fP7vStnBGVnOhLndXS2Mw8h5v X-Received: by 10.55.46.199 with SMTP id u190mr35434337qkh.33.1516316591432; Thu, 18 Jan 2018 15:03:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316591; cv=none; d=google.com; s=arc-20160816; b=a9J91w1CV/ct8lhVm0TpIy4P2imhDF02eRC5HZCdT9zeTWVj0OPW6PX0lhvCchp7pI HAsVCXlMwdybakSzi189v+EYgJ6nvM4IDZ8LrcaaQMig43G4WkHv+4JEXp9wjdRCQRzB MZ+mlcciZTmbI018OPLuEnue2doq++UtpLSKn6EkkfoRzUvkFdb2oZA8398AWFgJYk91 5LD0n66IWTqppFj8iYWcnIkghrId2jqzukzCHbakk1WprOf1GctDus0fkmbN0fc56rn6 h0tnmeVl+2/SGEKHVSsrlB6QOOsTAkdlf5Ja9oAWDTaUVPoMF/mv12mkotKDOWW7SNwf +Bkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=iX4Zsh844zRgt1VPAOgXm6wTsTwj2I2bMj5OMkbxeWs=; b=WhoZpLScSrsM4xwoC+9AjcGcl9eexiW9zd+MHCjKsTqofwSxqCoGPYdlVQy/O36TjN J0CBnK5exQuVWdEOQWmG9iW5Ig78K00oYrZKcjnn5NlQ+Z3c6ml2TDCB5to5QaYn4Pge adbn6xsBpCX66Um/zwpFaNPvT8K9HMjwnksEESlQKJjXay35xssqF4ECnn4vaFnLWX/r h8JmQc4/Ic1KuKQUxLFu+Ow8tOpiwbKtlzS7D2i3Ry1eS3tjGwRruNLpwv0Xife/6aa5 qDk+FpBjkzb/lxiwjAS7OcliMJ2jS7YWQSmJLAauGjI5qVeYgMVSUmJIa+JXqCdRiZnl jkmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id m4si7965950qkc.171.2018.01.18.15.03.11; Thu, 18 Jan 2018 15:03:11 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 06AAE61792; Thu, 18 Jan 2018 23:03:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C5DA2617B0; Thu, 18 Jan 2018 23:02:32 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 320E66172F; Thu, 18 Jan 2018 23:02:26 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id EA22E617AA for ; Thu, 18 Jan 2018 23:02:02 +0000 (UTC) Received: from mxback12j.mail.yandex.net (mxback12j.mail.yandex.net [IPv6:2a02:6b8:0:1619::87]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 98B295103A51 for ; Fri, 19 Jan 2018 02:02:01 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Iyr1xVEVPs-21aOQOrk; Fri, 19 Jan 2018 02:02:01 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-1tq0VHXk; Fri, 19 Jan 2018 02:01:55 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:18 +0300 Message-Id: <1516316420-16628-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 4/6] travis: move --with-dpdk-path out of DPDK build if X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov 1b285bbd (travis: also use DPDK when doing cross-compile tests) moved adding --with-dpdk-path to EXTRA_CONF to be executed under DPDK-building if. Move it outside of that if, so that DPDK is enabled even if it's prebuilt. Signed-off-by: Dmitry Eremin-Solenikov Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd571f4f3..2b56de029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -217,8 +217,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi + - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" # Netmap pktio - | From patchwork Thu Jan 18 23:00:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125058 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp34095ljf; Thu, 18 Jan 2018 15:03:54 -0800 (PST) X-Google-Smtp-Source: ACJfBouz9duY5AjvtjCipMcbVDKjS0cwIlMtp0xaKVz2hJyo81CwWBYTaWrw+IMRfJkfmeBTa3E+ X-Received: by 10.200.42.18 with SMTP id k18mr9114885qtk.150.1516316634111; Thu, 18 Jan 2018 15:03:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316634; cv=none; d=google.com; s=arc-20160816; b=ZXPeYrz4q1Djni0rSvYbgIn4Xqhea7pIuES64UjzhhJHRY7Y0/aGXfCVqmkR8Aa3jh YpdnoBLPeup8gHE+SNCkYrv8dxlAbpjloqPec66nY9cELSSJvDPxp17tf5+gTlbSU2mG sXW+xWHV8/AXXf9NXtOKJRovVv3ymZOnICsbe7F0ZGDv61bxjLMoHkT+NZfJHeca1XN0 AznCQ5tLUjMU0HIpfa2mCZNiaEMSoFnFvA0j4DAnoTk1UiK4olblYdw0lmp+lPcC8uCX uSU/d+GB17QiD2dNe7jImNHZo+WQRMb7SrcDQ6dZck9Vt/vMzcCXO4/XrVeZSPU/qpok Df6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=hyut+qcm/NpHToNIwoDkLiPykJJkd96vpiWiUeIdLZw=; b=PqIHPcMuDh2WCPAw3+xvDExbKpf3Rs6KiRuW4+FpM0tE6KzQ+iFF0wb13+pVSomEyt znHZg7bmgYylUEG63kMyp2DMQY/w/W4Jq0G8A54SB66tUJcp3VOee1AxgDgQpLL/QBgb cgIZE7ILRkLxe8iR7Rnp7yEWwjYAtazyBahyfON7mDMM5jUdEQSXIwMtETHfIgNIUzC1 6leEZMcMo+2pdI15ZMdJ7frH8LOGfbaqK/3Cyd/nItGJwS8/r4iskRZyR0pjEPrOePXD bB1CBRDH37ytz5neB4t+mzX7Jtda3WmoZnNH9OuRxp3gZdDBcEBDn441kmEQFsxU8g4m AM4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id n66si3022496qka.363.2018.01.18.15.03.53; Thu, 18 Jan 2018 15:03:54 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id CD855617AA; Thu, 18 Jan 2018 23:03:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8493D617D2; Thu, 18 Jan 2018 23:02:40 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 341AD6172F; Thu, 18 Jan 2018 23:02:29 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 754C261792 for ; Thu, 18 Jan 2018 23:02:14 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 810A02A21396 for ; Fri, 19 Jan 2018 02:02:08 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id IrUY7kzKOj-28XWnnCg; Fri, 19 Jan 2018 02:02:08 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-21qmdaUe; Fri, 19 Jan 2018 02:02:01 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:19 +0300 Message-Id: <1516316420-16628-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 5/6] build: another fix for linking with shared libdpdk X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ m4/odp_dpdk.m4 | 20 ++++++++++++++------ platform/linux-generic/Makefile.am | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 1887b0431..315a2fc4d 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -17,18 +17,28 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) # _ODP_DPDK_SET_LIBS # -------------------- -# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +# Set DPDK_LIBS/DPDK_LIBS_LT/DPDK_LIBS_LIBODP depending on DPDK setup AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl - DPDK_LIBS_LT="" + # applications don't need to be linked to anything, just rpath + DPDK_LIBS_LT="$DPDK_RPATH_LT" + # static linking flags will need -ldpdk DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" + # link libodp-linux with -ldpdk + DPDK_LIBS_LIBODP="$DPDK_LDFLAGS $DPDK_LIBS" ], [dnl ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + # build long list of libraries for applications, which should not be + # rearranged by libtool DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + # static linking flags follow the suite DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + # link libodp-linux with libtool linking flags + DPDK_LIBS_LIBODP="$DPDK_LIBS_LT" ]) AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LIBODP]) AC_SUBST([DPDK_LIBS_LT]) ]) @@ -99,7 +109,6 @@ AC_DEFUN([ODP_DPDK], [dnl AS_IF([test "x$1" = "xsystem"], [dnl DPDK_CPPFLAGS="-isystem/usr/include/dpdk" DPDK_LDFLAGS="" - DPDK_RPATH="" DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" if test "x$DPDK_LIB_PATH" = "x" ; then DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" @@ -115,10 +124,9 @@ AS_IF([test "x$1" = "xsystem"], [dnl DPDK_LDFLAGS="-L$DPDK_LIB_PATH" DPDK_PMD_PATH="$DPDK_LIB_PATH" if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then - DPDK_RPATH="-R$DPDK_LIB_PATH" + DPDK_RPATH="-Wl,-rpath,$DPDK_LIB_PATH" + DPDK_RPATH_LT="-R$DPDK_LIB_PATH" DPDK_SHARED=yes - else - DPDK_RPATH= fi ]) _ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9b7ee37e5..3abf765b5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -271,7 +271,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LIBODP) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) From patchwork Thu Jan 18 23:00:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125059 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp34343ljf; Thu, 18 Jan 2018 15:04:34 -0800 (PST) X-Google-Smtp-Source: ACJfBot6AfHq2BVGFO1Kqi+xpJmzYJ+y0yiFBBqZ+CmM6muF9Lq7ZfwEwhPYOCOVXtArqx8IKTEP X-Received: by 10.55.8.150 with SMTP id 144mr52641559qki.8.1516316674620; Thu, 18 Jan 2018 15:04:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316674; cv=none; d=google.com; s=arc-20160816; b=u6FYe+AI4s8eMg2bTjrU/NRyNeuN5ZqGdv59tc2fEN/VKYjA9EqcESAdZ24zTca1DY 0Q+IY4Uea//V+jI9sKIXOrR1wyj6bQxoXXttNdPJwS4hB3lOfcrHDY4dpiQ9be6Vh3Dh vohq1j0dZUruc5XjGm/ah+uJV1X3ilDqoBV2Tlgu5vxB3xZfuCVrOfrryKjRkPtdkOLZ vV/58iQPj3e8ICvDgH4btDaf/ey2kH/qbbg9nWHKCPWH2wFvGvC3Y7rd73esu8cDudog IBm+wLL7lwynk161xNatGEdTPLl5Cqr45XpkRjHEHZUQJClMFyPzqWWL+fDjF38UqnZQ Rn1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=q/uIqQ2N27Oyqvuuwn53tAKnnJEEyP5wGHT+Ot01iQg=; b=dAZB9epcZjehdRyhHiD6N66lrTN+JbrxuyKigsB4Y2ECu6JhangCP3yrdDW/JStpzQ SIx9deyDWwTXzTge2ANfJYDyn/N9A1Zoex97UsvGtZ88AUQIiDybKus0FOaFfLZd/Uw9 TpaNBs02mwdq5nFP2gMpmVy48xYdUdj1euLWFngZ/NB+zdIKR5KsP1eSDOj51vB7jRY0 0KOxcXMLO41FPPhTXQR2VkSBUZmhEMWrMJDEqVQTShK6oiCoXXMEtevsz8/btomUApGp 68zjmO1nk04imsELT6Igf3zrOMduIA4Pumeln/SIRx2TVRHM7Sj6mHQ0kSIBrpVpD1T5 Xu5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id h102si977145qkh.414.2018.01.18.15.04.34; Thu, 18 Jan 2018 15:04:34 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 56EA6617D2; Thu, 18 Jan 2018 23:04:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id D5E6162799; Thu, 18 Jan 2018 23:02:43 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A5DD5617AA; Thu, 18 Jan 2018 23:02:30 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 72BDF61795 for ; Thu, 18 Jan 2018 23:02:16 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 08ADC7844F4 for ; Fri, 19 Jan 2018 02:02:15 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id roaoAv7Q2O-2EMKS4vL; Fri, 19 Jan 2018 02:02:14 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-28qqoCGO; Fri, 19 Jan 2018 02:02:08 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:20 +0300 Message-Id: <1516316420-16628-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 6/6] travis: test ODP with shared DPDK X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Add testcase compiling and running ODP with shared DPDK lib Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b56de029..3feb3734a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ env: - CONF="--enable-schedule-iquery" - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - DPDK_SHARED="y" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" @@ -193,7 +194,15 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + # force DPDK rebuild if it does not match shared/non-shared requirement + if [ -n "$TARGET" -a -n "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ] ; then + rm -rf dpdk/"$TARGET" + fi + if [ -n "$TARGET" -a -z "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then + rm -rf dpdk/"$TARGET" + fi + - | + if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -209,6 +218,11 @@ install: if test -n "${DPDK_MACHINE}" ; then sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config fi + if test -n "${DPDK_SHARED}" ; then + sed -ri 's,(CONFIG_RTE_BUILD_SHARED_LIB=).*,\1y,' .config + export LD_LIBRARY_PATH="`pwd`/${TARGET}:$LD_LIBRARY_PATH" + echo $LD_LIBRARY_PATH + fi if test -n "$CROSS_ARCH" ; then sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config