On 06.12.2019 23:32, dwilder wrote: > On 2019-12-05 19:26, Lance Yang wrote: >> 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: Yanqin Wei <[email protected]> >> Reviewed-by: Malvika Gupta <[email protected]> >> Reviewed-by: Gavin Hu <[email protected]> >> Reviewed-by: Ruifeng Wang <[email protected]> >> Signed-off-by: Lance Yang <[email protected]> >> --- >> .travis.yml | 2 -- >> .travis/linux-prepare.sh | 3 ++- >> 2 files changed, 2 insertions(+), 3 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..6421066 100755 >> --- a/.travis/linux-prepare.sh >> +++ b/.travis/linux-prepare.sh >> @@ -18,7 +18,8 @@ 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 >> + sudo apt-get install -y \ >> + libunwind-dev:i386 libunbound-dev:i386 gcc-multilib >> fi >> >> # IPv6 is supported by kernel but disabled in TravisCI images: > > LGTM: > With this patch applied ppc64le simply needs to be include into the matrix. > I will submit an updated ppc64le patch to be layered on top of this one. > > Acked-by: David Wilder <[email protected]>
Thanks. First two patches of this series are good even without multiarch support so I went ahead and applied them (with minor visual/spelling changes) to master. We'll need to think more about actual enabling of ppc/arm since they are not that stable as we would want them to be. Best regards, Ilya Maximets. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
