From patchwork Wed Nov 20 08:14:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 1197965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arm.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47HwTv56Fjz9sPT for ; Wed, 20 Nov 2019 19:14:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 29C7988503; Wed, 20 Nov 2019 08:14:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2aSQone0OL6A; Wed, 20 Nov 2019 08:14:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 5BEDF884EE; Wed, 20 Nov 2019 08:14:57 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3EC72C1DDC; Wed, 20 Nov 2019 08:14:57 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 910B9C18DA; Wed, 20 Nov 2019 08:14:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8D678884E6; Wed, 20 Nov 2019 08:14:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4ZRWBshk3ZJH; Wed, 20 Nov 2019 08:14:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by hemlock.osuosl.org (Postfix) with ESMTP id A1F34884E5; Wed, 20 Nov 2019 08:14:53 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 327061FB; Wed, 20 Nov 2019 00:14:53 -0800 (PST) Received: from nfv-demo01.shanghai.arm.com (nfv-demo01.shanghai.arm.com [10.169.41.196]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BE23A3F52E; Wed, 20 Nov 2019 00:17:52 -0800 (PST) From: Lance Yang To: dev@openvswitch.org, ovs-dev@openvswitch.org Date: Wed, 20 Nov 2019 16:14:45 +0800 Message-Id: <1574237685-4747-1-git-send-email-Lance.Yang@arm.com> X-Mailer: git-send-email 2.7.4 Cc: Jieqiang.Wang@arm.com, Gavin.Hu@arm.com, Jingzhao.Ni@arm.com, dwilder@us.ibm.com, nd@arm.com, Ruifeng.Wang@arm.com Subject: [ovs-dev] [PATCH v1 2/4] travis: Move x86-only addon packages X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" To enable multiple CPU architectures support, it is necessary to move the x86-only addon packages from .travis.yml file. Otherwise, the x86-only addon packages will break the builds on some other CPU architectures. Reviewed-by: Yangqin Wei Reviewed-by: Malvika Gupta Reviewed-by: Gavin Hu Reviewed-by: Ruifeng Wang Signed-off-by: Lance Yang --- .travis.yml | 2 -- .travis/linux-prepare.sh | 12 ++++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 482efd2..2dc4d43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ addons: apt: packages: - bc - - gcc-multilib - libssl-dev - llvm-dev - libjemalloc1 @@ -26,7 +25,6 @@ addons: - libelf-dev - selinux-policy-dev - libunbound-dev - - libunbound-dev:i386 - libunwind-dev before_install: ./.travis/${TRAVIS_OS_NAME}-prepare.sh diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh index 9e3ac0d..8096abe 100755 --- a/.travis/linux-prepare.sh +++ b/.travis/linux-prepare.sh @@ -15,10 +15,14 @@ cd .. pip install --disable-pip-version-check --user six flake8 hacking pip install --user --upgrade docutils -if [ "$M32" ]; then - # 32-bit and 64-bit libunwind can not be installed at the same time. - # This will remove the 64-bit libunwind and install 32-bit version. - sudo apt-get install -y libunwind-dev:i386 +if [[ "$TRAVIS_ARCH" == "amd64" ]] || [[ -z "$TRAVIS_ARCH" ]]; then + if [ "$M32" ]; then + # 32-bit and 64-bit libunwind can not be installed at the same time. + # This will remove the 64-bit libunwind and install 32-bit version. + sudo apt-get install \ + -y libunwind-dev:i386 libunbound-dev:i386 gcc-multilib + fi + fi # IPv6 is supported by kernel but disabled in TravisCI images: