Merge lp:~raof/mir/driver-metapackages into lp:mir

[Chris Halse Rogers]

Add two driver metapackages - one for desktop, one for android.

The seeds can use this to get appropriate platform drivers installed and upgraded without us having to modify the seeds each time we change something in the platform packaging.

Mir-side fix for https://bugs.launchpad.net/mir/+bug/1378995

Add two driver metapackages - one for desktop, one for android.

The seeds can use this to get appropriate platform drivers installed and upgraded without us having to modify the seeds each time we change something in the platform packaging.

Mir-side fix for https://bugs.launchpad.net/mir/+bug/1378995

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/mir-ci/1763/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2060
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2067
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1997/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/934
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/934/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3004/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14371

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1763/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Looks like the right idea.

Did you need to move so much text though? The diff could be smaller without the moving.

review: Approve

[Chris Halse Rogers (raof)]

I decided to move all the driver packages into a separate “these will
disappear in the promised future” clump. I didn't think that made the
diff particularly onerous.

[Alexandros Frantzis (afrantzis)]

136 +Package: mir-graphics-drivers-desktop

Perhaps mir-graphics-drivers-mesa instead? We may have other non-Mesa desktop drivers.

[Alexandros Frantzis (afrantzis)]

> Perhaps mir-graphics-drivers-mesa instead? We may have other non-Mesa desktop drivers.

...or is the plan to actually hide that detail from other packages, too?

[Chris Halse Rogers (raof)]

Correct.

Hm. I was going to expound on driver package naming, but maybe I should document it in docs/ instead.

-----Original Message-----
From: "Alexandros Frantzis" <email address hidden>
Sent: ‎9/‎10/‎2014 18:32
To: "Chris Halse Rogers" <email address hidden>
Subject: Re: [Merge] lp:~raof/mir/driver-metapackages into lp:mir

> Perhaps mir-graphics-drivers-mesa instead? We may have other non-Mesa desktop drivers.

...or is the plan to actually hide that detail from other packages, too?
--
https://code.launchpad.net/~raof/mir/driver-metapackages/+merge/237706
You are the owner of lp:~raof/mir/driver-metapackages.

[Kevin DuBois (kdub)]

looks good

review: Approve

[Chris Halse Rogers (raof)]

CI scripts fixed to handle this, hitting the rebuild button...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/mir-ci/1773/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2010
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/111/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/947
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/947/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3019
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14469

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1773/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Exhausting the address space? Really, CI?

Let's hit that button *again*.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/mir-ci/1775/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2075
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2012
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/113/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/949
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/949/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3020
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14470

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1775/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Ugh. We actually need two different fixes. Platform ABI 4 for lp:mir (0.9) and platform ABI 3 for lp:mir/0.8.

See: https://code.launchpad.net/~vanvugt/mir/platform-ABI-4/+merge/237896

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/mir-ci/1777/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2014
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/115/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/951
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3022
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14474

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1777/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Well, "fortunately" CI is consistently running out of address space.

-----Original Message-----
From: "Daniel van Vugt" <email address hidden>
Sent: ‎10/‎10/‎2014 17:47
To: "Chris Halse Rogers" <email address hidden>
Subject: Re: [Merge] lp:~raof/mir/driver-metapackages into lp:mir

Review: Needs Fixing

Ugh. We actually need two different fixes. Platform ABI 4 for lp:mir (0.9) and platform ABI 3 for lp:mir/0.8.

See: https://code.launchpad.net/~vanvugt/mir/platform-ABI-4/+merge/237896
--
https://code.launchpad.net/~raof/mir/driver-metapackages/+merge/237706
You are the owner of lp:~raof/mir/driver-metapackages.

[Cemil Azizoglu (cemil-azizoglu)]

> Ugh. We actually need two different fixes. Platform ABI 4 for lp:mir (0.9) and
> platform ABI 3 for lp:mir/0.8.

Let's fix it on the tip of devel, please. We don't need a backport to RTM right now, as the landing team took care of this problem for us. We'll backport if need arises.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/mir-ci/1794/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2031
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/132/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/968
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/968/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3039
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14564

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1794/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Maybe this time, THIS TIME, gcc won't feel like exhausting 64bits of virtual address space?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/mir-ci/1810/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2053/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/990/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1810/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/mir-ci/1811/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/991
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/991/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3056
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14626

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1811/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Still looks OK.

Although maybe consider removing the word "desktop": mir-graphics-drivers-desktop
considering how many Intel-based tablets are around right now, it's plausible we'll be using Mesa on touch devices in the near future...

review: Approve

[Daniel van Vugt (vanvugt)]

"desktop" vs "mesa" vs some-other-name probably needs discussing.

The word "desktop" is going to cause confusion when it becomes a require package on non-desktops.

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> Maybe this time, THIS TIME, gcc won't feel like exhausting 64bits of virtual
> address space?

I got fginther onto that yesterday. His fix seems to have worked.

[Alan Griffiths (alan-griffiths)]

> "desktop" vs "mesa" vs some-other-name probably needs discussing.
>
> The word "desktop" is going to cause confusion when it becomes a require
> package on non-desktops.

I'm in favor of "mesa" vs "android" and eliminating "desktop".

review: Needs Fixing

[Robert Carr (robertcarr)]

Let's eliminate desktop suffix.

[Daniel van Vugt (vanvugt)]

Hmm, actually we're going to have to consider renaming "mesa" bits to "drm" in future. Because both Nvidia and AMD have announced they will support DRM in their proprietary drivers. However proprietary drivers provide their own libGL* -- which is not "mesa" :)

[Chris Halse Rogers (raof)]

On Wed, Oct 15, 2014 at 2:50 PM, Daniel van Vugt
<email address hidden> wrote:
> Hmm, actually we're going to have to consider renaming "mesa" bits to
> "drm" in future. Because both Nvidia and AMD have announced they will
> support DRM in their proprietary drivers. However proprietary drivers
> provide their own libGL* -- which is not "mesa" :)

This was indeed why I was going for -desktop; I know that there'll only
be one android platform, because... there's one android platform. There
may well be multiple desktop platforms, though :)

[Daniel van Vugt (vanvugt)]

Yep, "desktop" will remain more true for longer than "mesa".

Even though "desktop" will also be used on tablets and phones in future :)

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-10-10 05:53:01 +0000
+++ debian/control	2014-10-14 03:38:48 +0000
@@ -73,34 +73,6 @@
  Contains the shared libraries required for the Mir server to interact with
  the underlying hardware platform.
 
-Package: libmirplatform4driver-mesa
-Section: libs
-Architecture: i386 amd64 armhf arm64
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display server for Ubuntu - platform library for Mesa
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir server to interact with
- the hardware platform using the Mesa drivers.
-
-Package: libmirplatform4driver-android
-Section: libs
-Architecture: i386 amd64 armhf
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display server for Ubuntu - platform library for Android
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir server to interact with
- the hardware platform using the Android drivers.
-
 Package: libmircommon-dev
 Section: libdevel
 Architecture: i386 amd64 armhf arm64
@@ -179,34 +151,6 @@
  .
  Contains header files required to develop against Mir.
 
-Package: libmirclient8driver-mesa
-Section: libs
-Architecture: i386 amd64 armhf arm64
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: Display server for Ubuntu - client platform library for Mesa
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir clients to interact with
- the underlying hardware platform using the Mesa drivers.
-
-Package: libmirclient8driver-android
-Section: libs
-Architecture: i386 amd64 armhf
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: Display server for Ubuntu - client platform library for Android
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir clients to interact with
- the underlying hardware platform using the Android drivers.
-
 Package: mir-demos
 Architecture: i386 amd64 armhf arm64
 Depends: ${misc:Depends},
@@ -259,3 +203,90 @@
  robust operation and a well-defined driver model.
  .
  Contains the shared libraries required for the Mir server and client.
+
+# Longer-term these drivers should move out-of-tree
+Package: libmirclient8driver-mesa
+Section: libs
+Architecture: i386 amd64 armhf arm64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Display server for Ubuntu - client platform library for Mesa
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir clients to interact with
+ the underlying hardware platform using the Mesa drivers.
+
+Package: libmirclient8driver-android
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Display server for Ubuntu - client platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir clients to interact with
+ the underlying hardware platform using the Android drivers.
+
+Package: libmirplatform4driver-mesa
+Section: libs
+Architecture: i386 amd64 armhf arm64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - platform library for Mesa
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Mesa drivers.
+
+Package: libmirplatform4driver-android
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Android drivers.
+
+Package: mir-graphics-drivers-desktop
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+	 libmirplatform3driver-mesa,
+	 libmirclient8driver-mesa
+Description: Display server for Ubuntu - desktop driver metapackage
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ This package depends on a full set of graphics drivers for traditional desktop
+ systems.
+
+Package: mir-graphics-drivers-android
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+	 libmirplatform4driver-android,
+	 libmirclient8driver-android
+Description: Display server for Ubuntu - android driver metapackage
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ This package depends on a full set of graphics drivers for running Mir on top
+ of an existing Android driver stack.