[PATCH] ubuntu_kernel_selftests: fix libnuma-dev install for s390x

Kleber Sacilotto de Souza kleber.souza at canonical.com
Fri Apr 21 09:10:58 UTC 2017


After commit 27a538cb64541c30cfb0b1e9cc42e1d03d0f5e30
(ubuntu_kernel_selftests: net tests require libnuma-dev), all
ubuntu_kernel_selftests are failing for s390x on series earlier than
Yakkety, since libnuma-dev is being built only from this series on.

Fix it by not installing the package when running older series on s390x.
Net tests are expected to continue failing though.

Signed-off-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
---
 ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
index 30e045df..2910fe29 100644
--- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
+++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
@@ -12,8 +12,10 @@ class ubuntu_kernel_selftests(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'git', 'libnuma-dev'
+            'build-essential', 'git'
         ]
+        if not (arch == 's390x' and series in ['precise', 'trusty', 'vivid', 'xenial']):
+            pkgs.append('libnuma-dev')
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
 
-- 
2.11.0





More information about the kernel-team mailing list