diff options
| author | Lance Yang <Lance.Yang@arm.com> | 2019-12-06 11:26:12 +0800 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2019-12-13 18:45:10 +0100 |
| commit | bdfab59371f8028d25e4943df20066c3055fa94e (patch) | |
| tree | 9153dca888dd582fc278767a6e8f0a89e970d8b5 | |
| parent | 96445fa4d9fa0dd8e1f72c0339a2dc6242cd37de (diff) | |
| download | openvswitch-bdfab59371f8028d25e4943df20066c3055fa94e.tar.gz | |
travis: Move x86-only add-on packages to linux-prepare script.
To enable multiple CPU architectures support, it is necessary to move
the x86-only add-on packages from .travis.yml file. Otherwise, the
x86-only add-on packages will break the builds on some other CPU
architectures.
Reviewed-by: Yanqin Wei <Yanqin.Wei@arm.com>
Reviewed-by: Malvika Gupta <Malvika.Gupta@arm.com>
Reviewed-by: Gavin Hu <Gavin.Hu@arm.com>
Reviewed-by: Ruifeng Wang <Ruifeng.Wang@arm.com>
Acked-by: David Wilder <dwilder@us.ibm.com>
Signed-off-by: Lance Yang <Lance.Yang@arm.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/linux-prepare.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 482efd2d1..2dc4d436b 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 9e3ac0df7..2e57945f5 100755 --- a/.travis/linux-prepare.sh +++ b/.travis/linux-prepare.sh @@ -16,9 +16,11 @@ pip install --disable-pip-version-check --user six flake8 hacking pip install --user --upgrade docutils if [ "$M32" ]; then + # Installing 32-bit libraries. # 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 + sudo apt-get install -y \ + libunwind-dev:i386 libunbound-dev:i386 gcc-multilib fi # IPv6 is supported by kernel but disabled in TravisCI images: |