[rdma-core,2/5] cbuild: Remove ubuntu trusty

Commit Message

Jason Gunthorpe May 14, 2019, 11:30 p.m. UTC

From: Jason Gunthorpe <[e-mail]>

We only support 2 LTSs at any given time, xenial and bionic are the ones
for Ubuntu. cythond oesn't work on xenial so remove it frmo the package
list as well.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 buildlib/cbuild | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

Comments

Leon Romanovsky May 15, 2019, 5:25 a.m. UTC | #1

On Tue, May 14, 2019 at 08:30:25PM -0300, Jason Gunthorpe wrote:
> From: Jason Gunthorpe <[e-mail]>
>
> We only support 2 LTSs at any given time, xenial and bionic are the ones
> for Ubuntu. cythond oesn't work on xenial so remove it frmo the package
> list as well.

"cythond oesn't" -> "cython doesn't"
"frmo" -> "from"

Thanks

Jason Gunthorpe May 15, 2019, 3:17 p.m. UTC | #2

On Wed, May 15, 2019 at 08:25:09AM +0300, Leon Romanovsky wrote:
> On Tue, May 14, 2019 at 08:30:25PM -0300, Jason Gunthorpe wrote:
> > From: Jason Gunthorpe <[e-mail]>
> >
> > We only support 2 LTSs at any given time, xenial and bionic are the ones
> > for Ubuntu. cythond oesn't work on xenial so remove it frmo the package
> > list as well.
> 
> "cythond oesn't" -> "cython doesn't"
> "frmo" -> "from"

done

Patch

diff --git a/buildlib/cbuild b/buildlib/cbuild
index 30a06f06345743..3035db9f375c1d 100755
--- a/buildlib/cbuild
+++ b/buildlib/cbuild
@@ -173,9 +173,9 @@  class APTEnvironment(Environment):
             " ".join(sorted(self.pkgs))));
         return res;
 
-class trusty(APTEnvironment):
-    docker_parent = "ubuntu:14.04";
-    common_pkgs = {
+class xenial(APTEnvironment):
+    docker_parent = "ubuntu:16.04"
+    pkgs = {
         'build-essential',
         'cmake',
         'debhelper',
@@ -183,32 +183,24 @@  class trusty(APTEnvironment):
         'gcc',
         'libnl-3-dev',
         'libnl-route-3-dev',
+        'libsystemd-dev',
         'libudev-dev',
         'make',
         'ninja-build',
         'pandoc',
         'pkg-config',
+        'python3',
         'valgrind',
-        };
-    pkgs = common_pkgs | {
-        'libsystemd-daemon-dev',
-        'libsystemd-id128-dev',
-        'libsystemd-journal-dev',
-        };
-    name = "ubuntu-14.04";
-    aliases = {"trusty"};
-    python_cmd = "python";
-    build_pyverbs = False;
-
-class xenial(APTEnvironment):
-    docker_parent = "ubuntu:16.04"
-    pkgs = trusty.common_pkgs | {"libsystemd-dev", "python3-dev", "cython3"};
+    };
     name = "ubuntu-16.04";
     aliases = {"xenial"};
 
 class bionic(APTEnvironment):
     docker_parent = "ubuntu:18.04"
-    pkgs = xenial.pkgs
+    pkgs = xenial.pkgs | {
+        'cython3',
+        'python3-dev',
+    };
     name = "ubuntu-18.04";
     aliases = {"bionic", "ubuntu"};
 
@@ -221,7 +213,7 @@  class jessie(APTEnvironment):
 
 class stretch(APTEnvironment):
     docker_parent = "debian:9"
-    pkgs = jessie.pkgs;
+    pkgs = bionic.pkgs;
     name = "debian-9";
     aliases = {"stretch"};
 
@@ -380,7 +372,6 @@  environments = [centos6(),
                 centos7(),
                 centos7_epel(),
                 travis(),
-                trusty(),
                 xenial(),
                 bionic(),
                 jessie(),