From patchwork Wed Jul 12 12:00:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107484 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp719820qge; Wed, 12 Jul 2017 05:04:28 -0700 (PDT) X-Received: by 10.55.102.199 with SMTP id a190mr5344364qkc.163.1499861068823; Wed, 12 Jul 2017 05:04:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499861068; cv=none; d=google.com; s=arc-20160816; b=bAt2z5F2voddvM+ez6GLTPkjSzFy/lLyDa2nKnHdmh46lHzpUhWia2rD8sAwfTbTxE FcmKTCb2u5PeftV2poKeged+/mI06/Vdcf6UDIRhOPdA0naNxa4m/6sQtH0hmMhz/u3T qIZlLrNOjF8dO2A3fLFIoJJIk6sqi1Tz1HmaOx4lZwWyoszrBsmfnqTgkTLSdjrEpn9E msqRNWUXcPkXoXXgLC2CylLXlmWitMSnxo+0dugKGZ/d4SgcCpvBps9H9gr3xBERJSEV HWSQnszqVC02ibsRLzip9wthlmm8rITl5AV5frRA1xvKx1Jae2S+mi7Sd/O08wGwp35V NXHw== 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=Lu7qHrlMDDqT6jhOOk0neCcbin1pqeJiee0jL0qK/Ok=; b=N2aGCKtN3ewzLcRlnt/r7ZKYbPjJbihpydn+gZ7APEYpbbwteM1GhU3ZBX3dYqgAk4 Jg7uqxKh/UuK7DZm5Mh36xD0vJKKtpmLOG/Gb+86J3RD/cLDtTCML/CrvDQc/sShr87F 72HwuqGRd1FaCNoqSYonWipEvHgPPv4yrDl+XJl7htrGcgGuNfcwhizMqbxAu1AVPUlq JroncT4jNe9FmGIjTuvtmqOMOcl/qAz+bcBIJIHpjGqtNM7b8N05P2kVe9d60ROnL0LT hkfpxxSEqzJKjY04X74DnrOzamc+oK2Z/rwGszIc0oY+kfps3diC9Zf1xxGV6hg+HcZl Ea7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v43si2134400qtv.60.2017.07.12.05.04.28; Wed, 12 Jul 2017 05:04:28 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 7212061057; Wed, 12 Jul 2017 12:04:28 +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,URIBL_BLOCKED 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 AE4F764496; Wed, 12 Jul 2017 12:01:49 +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 5F0C760D99; Wed, 12 Jul 2017 12:01:30 +0000 (UTC) Received: from forward5o.cmail.yandex.net (forward5o.cmail.yandex.net [37.9.109.249]) by lists.linaro.org (Postfix) with ESMTPS id 4757460721 for ; Wed, 12 Jul 2017 12:00:23 +0000 (UTC) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [95.108.252.166]) by forward5o.cmail.yandex.net (Yandex) with ESMTP id 36F9D2152E for ; Wed, 12 Jul 2017 15:00:22 +0300 (MSK) Received: from smtp4p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp4p.mail.yandex.net (Yandex) with ESMTP id BD3F165011F2 for ; Wed, 12 Jul 2017 15:00:21 +0300 (MSK) Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id PBpqRjFSaD-0KJKZLJ0; Wed, 12 Jul 2017 15:00:20 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 12 Jul 2017 15:00:14 +0300 Message-Id: <1499860815-9962-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499860815-9962-1-git-send-email-odpbot@yandex.ru> References: <1499860815-9962-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 73 Subject: [lng-odp] [PATCH v1 2/3] travis: simplify cross-compilation setup 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 Following Maxim's idea use apt-get to download and install cross-packages. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 73 (lumag:cross-2) ** https://github.com/Linaro/odp/pull/73 ** Patch: https://github.com/Linaro/odp/pull/73.patch ** Base sha: 7fc6d27e937b57b31360b07028388c811f8300dc ** Merge commit sha: a4eb9d1fce06d324ea13633a5df60a00640673c8 **/ .travis.yml | 65 ++++++++++++++++++++----------------------------------------- 1 file changed, 21 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index 665d70f8..36728afc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,6 @@ addons: - clang-3.8 - automake autoconf libtool libssl-dev graphviz mscgen doxygen - libpcap-dev - - dpkg-cross equivs - - gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu libc6-dev-arm64-cross - - gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross - - gcc-powerpc-linux-gnu pkg-config-powerpc-linux-gnu libc6-dev-powerpc-cross # coverity_scan: # project: # name: "$TRAVIS_REPO_SLUG" @@ -66,7 +62,24 @@ env: - CONF="--enable-schedule-iquery" before_install: -# Install cunit for the validation tests because distro version is too old and fails C99 compile + + # Install cross toolchains, etc + # apt-get update may fail thanks to Ubuntu removing Packages/indices while not removing relevant parts of Release file + - if [ -n "$CROSS_ARCH" ] ; + then + BUILD_GNU_TYPE=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_BUILD_GNU_TYPE` ; + CROSS_GNU_TYPE=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_GNU_TYPE` ; + CROSS_MULTIARCH=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_MULTIARCH` ; + CROSS="--host="$CROSS_GNU_TYPE" --build="$BUILD_GNU_TYPE" --prefix=/usr --includedir=/usr/include/"$CROSS_MULTIARCH" --libdir=/usr/lib/"$CROSS_MULTIARCH" --libexecdir=/usr/lib/"$CROSS_MULTIARCH"" ; + sudo dpkg --add-architecture "$CROSS_ARCH" ; + 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 gcc-"$CROSS_GNU_TYPE" pkg-config-"$CROSS_GNU_TYPE" ; + 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" ; + fi + + # Install cunit for the validation tests because distro version is too old and fails C99 compile - sudo apt-get remove libcunit1-dev libcunit1 - export CUNIT_VERSION=2.1-3 - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2 @@ -134,63 +147,27 @@ jobs: include: - stage: test compiler: aarch64-linux-gnu-gcc - env: TEST="aarch64-linux-gnu" CROSS="--host=aarch64-linux-gnu --prefix=/usr/aarch64-linux-gnu" + env: TEST="aarch64-linux-gnu" CROSS_ARCH="arm64" install: true script: - - mkdir cross - - pushd cross - # one can not include colon in the command or bad things will happen, so mimic it - - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy - - equivs-build -a arm64 dummy - - wget - http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_arm64.deb - http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_arm64.deb - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_arm64.deb - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_arm64.deb - - sudo dpkg-cross -i -M -A -a arm64 *.deb - - popd - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc - env: TEST="arm-linux-gnueabihf" CROSS="--host=arm-linux-gnueabihf --prefix=/usr/arm-linux-gnueabihf" + env: TEST="arm-linux-gnueabihf" CROSS_ARCH="armhf" install: true script: - - mkdir cross - - pushd cross - # one can not include colon in the command or bad things will happen, so mimic it - - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy - - equivs-build -a armhf dummy - - wget - http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_armhf.deb - http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_armhf.deb - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_armhf.deb - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_armhf.deb - - sudo dpkg-cross -i -M -A -a armhf *.deb - - popd - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc - env: TEST="powerpc-linux-gnu" CROSS="--host=powerpc-linux-gnu --prefix=/usr/powerpc-linux-gnu" + env: TEST="powerpc-linux-gnueabihf" CROSS_ARCH="powerpc" install: true script: - - mkdir cross - - pushd cross - # one can not include colon in the command or bad things will happen, so mimic it - - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy - - equivs-build -a powerpc dummy - - wget - http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_powerpc.deb - http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_powerpc.deb - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_powerpc.deb - http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_powerpc.deb - - sudo dpkg-cross -i -M -A -a powerpc *.deb - - popd - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example