Merge lp:~cemil-azizoglu/mir/rename-mesa-to-KMS into lp:mir

[Cemil Azizoglu]

Renames the mesa graphics platform driver to KMS.

X platform will also be using Mesa driver, so there is a need to differentiate.

The Mesa and X client platform drivers are identical so far, so the Mesa client platform driver stays unchanged.

Renames the mesa graphics platform driver to KMS.

X platform will also be using Mesa driver, so there is a need to differentiate.

The Mesa and X client platform drivers are identical so far, so the Mesa client platform driver stays unchanged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2605
http://jenkins.qa.ubuntu.com/job/mir-ci/3942/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/137
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2574/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2574/console

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

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Nit: I'd probably use lowercase kms in the binary names. You certainly need to use it for the package names - Debian policy restricts package names to lowercase only.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I think "DRM"/"DRI" terminology might also be a good option. If you look at the code it's all "drm", some of which leads to KMS logic via "drm" functions.

And proprietary drivers may retain the KMS part but swap out the GBM logic.

I think it might be premature to choose a new name until the driver code itself is further teased apart...

review: Needs Information

[Chris Halse Rogers (raof)]

The end-state for this code is that it *is* the kms bits; the non-display buffer alloc and such becomes shared with X.

[Daniel van Vugt (vanvugt)]

(1) Consider using the name "drm" instead of "kms"...
http://en.wikipedia.org/wiki/File:DRM_architecture.svg

(2) Package and binary names should lower case:

83 +Package: mir-platform-graphics-KMS2

70 + -DMIR_PLATFORM=android\;KMS \

review: Needs Fixing

[Kevin DuBois (kdub)]

> I think it might be premature to choose a new name until the driver code
> itself is further teased apart...
+1, I guess here's my shot at teasing apart...
In current mir parlance, (for better or worse, probably worse) a platform (mg::Platform) is current "a gpu and an output".
So currently,
"android" == gralloc + hwc
"mesa" == gbm + drm

If we separated mg::Platform out into GpuPlatform and DisplayPlatform [1], then what is going on falls into place easily:
DisplayPlatforms are hwc, drm, X, nested, offscreen
GpuPlatforms are gralloc, gbm

[1] or similar names

[Alexandros Frantzis (afrantzis)]

> "mesa" == gbm + drm

DRM provides a rich set of functions, a subset of which deal with display modesetting (called KMS). I think it's more accurate to use 'kms' for this DisplayPlatform, which implies that we are using DRM facilities (since KMS is a part of DRM), rather than the all-encompassing 'drm'.

[Cemil Azizoglu (cemil-azizoglu)]

Updated with s/KMS/kms in binaries and package name.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2607
http://jenkins.qa.ubuntu.com/job/mir-ci/3948/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2633
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2581/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2608
http://jenkins.qa.ubuntu.com/job/mir-ci/3950/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2635
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2583
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2583/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5433
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20847

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

LGTM now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2610
http://jenkins.qa.ubuntu.com/job/mir-ci/3963/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2599
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2599
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2599/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5450
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20878

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2611
http://jenkins.qa.ubuntu.com/job/mir-ci/3967/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2603
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5452
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20880

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

(3) If presently:
  "android" == gralloc + hwc
  "mesa" == gbm + drm
and you propose:
  "kms" == gbm + drm
then how do we fit in (soon):
  "nvidia" = eglstreams + kms
? Seems like "kms" then is the wrong name for the open driver because nvidia et all will use KMS too.

(4) Is this right that the platform dir is still named "mesa" or are we intentionally only halfway there?

$ ls src/platforms/
android CMakeLists.txt common mesa

review: Needs Information

[Alan Griffiths (alan-griffiths)]

*Needs Discussion*

We've a host of names around parts of the display stack. And it sounds as though this rename is simplistic.

I like Kevin's suggestion that we should tease apart the GPU driver from display platform, but I don't know how practical that is at this stage. (This also fits with other discussions we're had about GPU-less compositing.)

Do we have a clear consensus view on what the endpoint should be? Or should we accept this as a useful intermediate stage while we explore?

review: Needs Information

[Alexandros Frantzis (afrantzis)]

> Seems like "kms" then is the wrong name for the open driver because nvidia et all will use KMS too.

I agree that a better name for this would be 'kms-mesa' or similar, and "x11-mesa" for the X new platform. If we split the Platform into a DisplayPlatform and GPUPlatform (or however we call them), then we could have a standalone DisplayPlatform we can call "kms".

Needs discussion.

review: Needs Information

[Kevin DuBois (kdub)]

We don't have a 'bucket' for X to live in because X11 is not a buffer allocator, its a display implementation, and it depends on the mesa platform. This isn't a problem for Nested and Offscreen, because they're platform-independent, so they can live in libmirserver.so.

I still think that separating out the display from the buffer allocator system is useful for other purposes. If we don't tease this out though, but perhaps X-backed displays are a platform-specific option of the mesa platform. (like, they take a platform specific option to switch out the display type generated by mgm::Platform).

If X displays could somehow be made platform-independent, then it would seem that they're the same sort of thing as an offscreen/nested display.

So I guess I'd be happy with any of:
1) a platform specific option to the mesa platform that triggers the mgm::Platform::create_display to make the X object.
2) teasing out the buffer allocation from the display in mg::Platform, and X would just be a display platform.
3) X displays being platform independent and living in libmirserver (although I've heard that the way that the X code works won't work for android; have to wait and see the code)
4) having an x11-mesa and a kms-platform (although this seems like a lot more plumbing than a platform specific switch)

[Cemil Azizoglu (cemil-azizoglu)]

> (3) If presently:
> "android" == gralloc + hwc
> "mesa" == gbm + drm
> and you propose:
> "kms" == gbm + drm
> then how do we fit in (soon):
> "nvidia" = eglstreams + kms
> ? Seems like "kms" then is the wrong name for the open driver because nvidia
> et all will use KMS too.
>
> (4) Is this right that the platform dir is still named "mesa" or are we
> intentionally only halfway there?
>
> $ ls src/platforms/
> android CMakeLists.txt common mesa

Yes the directory is named mesa. Both kms (or whatever we end up naming it) and x11 use mesa, so we have a top level mesa directory.

[Cemil Azizoglu (cemil-azizoglu)]

> We don't have a 'bucket' for X to live in because X11 is not a buffer
> allocator, its a display implementation, and it depends on the mesa platform.
> This isn't a problem for Nested and Offscreen, because they're platform-
> independent, so they can live in libmirserver.so.
>
> I still think that separating out the display from the buffer allocator system
> is useful for other purposes. If we don't tease this out though, but perhaps
> X-backed displays are a platform-specific option of the mesa platform. (like,
> they take a platform specific option to switch out the display type generated
> by mgm::Platform).
>
> If X displays could somehow be made platform-independent, then it would seem
> that they're the same sort of thing as an offscreen/nested display.
>
> So I guess I'd be happy with any of:
> 1) a platform specific option to the mesa platform that triggers the
> mgm::Platform::create_display to make the X object.
> 2) teasing out the buffer allocation from the display in mg::Platform, and X
> would just be a display platform.
> 3) X displays being platform independent and living in libmirserver (although
> I've heard that the way that the X code works won't work for android; have to
> wait and see the code)
> 4) having an x11-mesa and a kms-platform (although this seems like a lot more
> plumbing than a platform specific switch)

We discussed this on the standup today. Here are the major points :
- Agreed with kdub on separating gpu and display parts of the platform but this is an existing issue and will complicate and delay introduction of X support into the tree. We can just as easily do this once x11 support is merged in as it's pretty self-contained.
- Also agreed that x11 support is just a different way of handling the display and could be rolled into the existing mesa driver with a platform specific flag. But this will make the code less readable, and introduce X dependency into the existing mesa driver. It could however be done in the future.
- Agreed that the mesa driver will be renamed to graphics-mesa-kms. The x11 driver will be named accordingly.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2613
http://jenkins.qa.ubuntu.com/job/mir-ci/3975/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/178
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2615/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2615
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2615/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5464/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20903

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

48+if(MIR_BUILD_PLATFORM_KMS)
51+make_lib_descriptor(platformgraphicskms LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
183+To run Mir with the default `KMS` platform you need a linux kernel with at
(others)

a few missed sed renames following the change to kms-> mesa-kms... otherwise okay

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2614
http://jenkins.qa.ubuntu.com/job/mir-ci/3978/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2619
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5468
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20908

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Note sure about having a dash in the driver name, but sounds much less confusing now.

review: Abstain

[Alan Griffiths (alan-griffiths)]

I usually get these incantations wrong (so don't take my word for it):

87 -Package: mir-platform-graphics-mesa2
88 +Package: mir-platform-graphics-mesa-kms2

Don't we need also need

     Replaces: mir-platform-graphics-mesa2
     Breaks: mir-platform-graphics-mesa2

review: Needs Information

[Chris Halse Rogers (raof)]

I don't think so.

We don't need the Breaks/Replaces incantation because there are no files in common with the old package (it's now graphics-mesa-kms.so)

We might want some sort of "the old package should be removed" marker, though. Although they don't conflict, I'm not sure which one our code will pick if both are installed, which could lead to bugs we fix in kms-mesa.so not appearing to be fixed because the system is picking up an old mesa.so.

-----Original Message-----
From: "Alan Griffiths" <email address hidden>
Sent: ‎3/‎06/‎2015 20:40
To: "Cemil Azizoglu" <email address hidden>
Subject: Re: [Merge] lp:~cemil-azizoglu/mir/rename-mesa-to-KMS into lp:mir

Review: Needs Information

I usually get these incantations wrong (so don't take my word for it):

87 -Package: mir-platform-graphics-mesa2
88 +Package: mir-platform-graphics-mesa-kms2

Don't we need also need

     Replaces: mir-platform-graphics-mesa2
     Breaks: mir-platform-graphics-mesa2

--
https://code.launchpad.net/~cemil-azizoglu/mir/rename-mesa-to-KMS/+merge/260533
You are reviewing the proposed merge of lp:~cemil-azizoglu/mir/rename-mesa-to-KMS into lp:mir.

[Cemil Azizoglu (cemil-azizoglu)]

> I don't think so.
>
> We don't need the Breaks/Replaces incantation because there are no files in
> common with the old package (it's now graphics-mesa-kms.so)
>
> We might want some sort of "the old package should be removed" marker, though.
> Although they don't conflict, I'm not sure which one our code will pick if
> both are installed, which could lead to bugs we fix in kms-mesa.so not
> appearing to be fixed because the system is picking up an old mesa.so.
>

According to my research, we need to do what's explained here as method 2 :
https://wiki.debian.org/Renaming_a_Package. (It still uses Replaces/Breaks). Let me know if you have a better idea.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2615
http://jenkins.qa.ubuntu.com/job/mir-ci/3991/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2690
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2638/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2638/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2616
http://jenkins.qa.ubuntu.com/job/mir-ci/3995/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2642
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2642/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5487
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20944

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1505/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2716/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2664/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2664/console

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Failed due to conflicts which have now been resolved. Re-TAing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2617
http://jenkins.qa.ubuntu.com/job/mir-ci/4015/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/235
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2670/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/171
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2670
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2670/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5514/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20975

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

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Failure is : https://bugs.launchpad.net/mir/+bug/1462088. Re-TAing

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -143,20 +143,20 @@
 
 add_definitions(-DMESA_EGL_NO_X11_HEADERS)
 
-# Default to mesa backend, but build all of them
+# Default to KMS backend, but build all of them
 set(
   MIR_PLATFORM
-  mesa;android
+  mesa-kms;android
   CACHE
   STRING
-  "a list of graphics backends to build (options are 'mesa' or 'android')"
+  "a list of graphics backends to build (options are 'mesa-kms' or 'android')"
 )
 
 list(GET MIR_PLATFORM 0 MIR_TEST_PLATFORM)
 
 foreach(platform IN LISTS MIR_PLATFORM)
-  if (platform STREQUAL "mesa")
-    set(MIR_BUILD_PLATFORM_MESA TRUE)
+  if (platform STREQUAL "mesa-kms")
+    set(MIR_BUILD_PLATFORM_MESA_KMS TRUE)
   endif()
   if (platform STREQUAL "android")
      set(MIR_BUILD_PLATFORM_ANDROID TRUE)
@@ -183,7 +183,7 @@
   find_package(LibHardware REQUIRED)
 endif()
 
-if (MIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
   find_package( PkgConfig )
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )

=== modified file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2015-06-03 22:10:24 +0000
+++ cmake/ABICheck.cmake	2015-06-04 17:06:35 +0000
@@ -80,9 +80,9 @@
 make_lib_descriptor(server)
 make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${mircommon-exclude-headers})
 make_lib_descriptor(platform INCLUDE_PRIVATE EXCLUDE_HEADERS ${mirplatform-exclude-headers})
-if(MIR_BUILD_PLATFORM_MESA)
+if(MIR_BUILD_PLATFORM_MESA_KMS)
 make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
-make_lib_descriptor(platformgraphicsmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
+make_lib_descriptor(platformgraphicsmesakms LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
 endif()
 if(MIR_BUILD_PLATFORM_ANDROID)
 make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
@@ -125,8 +125,8 @@
 endmacro(_define_abi_check_for)
 
 set(the_libs mirserver mirclient mircommon mirplatform)
-if(MIR_BUILD_PLATFORM_MESA)
-  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesa)
+if(MIR_BUILD_PLATFORM_MESA_KMS)
+  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
 endif()
 if(MIR_BUILD_PLATFORM_ANDROID)
   set(the_libs ${the_libs} mirclientplatformandroid mirplatformgraphicsandroid)

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2015-01-21 07:34:50 +0000
+++ cross-compile-chroot.sh	2015-06-04 17:06:35 +0000
@@ -77,7 +77,7 @@
     echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
       -DBoost_COMPILER=-gcc \
-      -DMIR_PLATFORM=android\;mesa \
+      -DMIR_PLATFORM=android\;mesa-kms \
       .. 
 
     make -j${NUM_JOBS} $@

=== modified file 'debian/control'
--- debian/control	2015-06-04 02:26:53 +0000
+++ debian/control	2015-06-04 17:06:35 +0000
@@ -268,19 +268,31 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
+Package: mir-platform-graphics-mesa-kms2
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: mir-platform-graphics-mesa2 (<< 0.14)
+Breaks: mir-platform-graphics-mesa2 (<< 0.14)
+Description: Display server for Ubuntu - platform library for KMS 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: mir-platform-graphics-mesa2
-Section: libs
+Section: oldlibs
 Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Depends: mir-platform-graphics-mesa-kms2,
+         ${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.
+Description: transitional dummy package
+ This is a transitional dummy package created due to package renaming.
+ It can safely be removed.
 
 Package: mir-platform-graphics-android2
 Section: libs
@@ -344,7 +356,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa2,
+         mir-platform-graphics-mesa-kms2,
          mir-client-platform-mesa2,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,

=== modified file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh	2015-06-04 02:26:53 +0000
+++ debian/create_postinst_prerm_scripts.sh	2015-06-04 17:06:35 +0000
@@ -9,10 +9,10 @@
 mir_platform_types="${PLATFORM_DRIVER}"
 case $deb_host_arch in
     amd64|i386|armhf)
-        mir_platforms="android mesa"
+        mir_platforms="android mesa-kms"
         ;;
     *)
-        mir_platforms="mesa"
+        mir_platforms="mesa-kms"
         ;;
 esac
 

=== modified file 'debian/install_ld_so_conf.sh'
--- debian/install_ld_so_conf.sh	2015-06-04 02:26:53 +0000
+++ debian/install_ld_so_conf.sh	2015-06-04 17:06:35 +0000
@@ -8,11 +8,10 @@
 mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}"
 case $DEB_HOST_ARCH in
     amd64|i386|armhf)
-        mir_platforms="android mesa"
+        mir_platforms="android mesa-kms"
         ;;
     *)
-        mir_platforms="mesa"
-        ;;
+        mir_platforms="mesa-kms"
 esac
 
 for platform_type in $mir_platform_types;

=== renamed file 'debian/mir-platform-graphics-mesa2.install' => 'debian/mir-platform-graphics-mesa-kms2.install'
--- debian/mir-platform-graphics-mesa2.install	2015-05-07 09:06:20 +0000
+++ debian/mir-platform-graphics-mesa-kms2.install	2015-06-04 17:06:35 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa.so.2
+usr/lib/*/mir/server-platform/graphics-mesa-kms.so.2

=== modified file 'debian/rules'
--- debian/rules	2015-06-04 02:26:53 +0000
+++ debian/rules	2015-06-04 17:06:35 +0000
@@ -28,16 +28,16 @@
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
 	  -DMIR_RUN_INTEGRATION_TESTS=OFF \
-	  -DMIR_PLATFORM=android\;mesa
+	  -DMIR_PLATFORM=android\;mesa-kms
 else
 ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH)),)
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
-	  -DMIR_PLATFORM=mesa\;android
+	  -DMIR_PLATFORM=mesa-kms\;android
 else
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
-	  -DMIR_PLATFORM=mesa
+	  -DMIR_PLATFORM=mesa-kms
 endif
 endif
 

=== modified file 'doc/kernel_requirements.md'
--- doc/kernel_requirements.md	2015-04-13 15:57:33 +0000
+++ doc/kernel_requirements.md	2015-06-04 17:06:35 +0000
@@ -1,7 +1,7 @@
 Linux Kernel Requirements for Mir
 =================================
 
-To run Mir with the default `mesa` platform you need a linux kernel with at
+To run Mir with the default `mesa-kms` platform you need a linux kernel with at
 least:
 
 Modules: i915, radeon and nouveau, to support the broadest range of common

=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ src/platforms/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -52,8 +52,8 @@
 
 add_subdirectory(common/)
 
-if (MIR_BUILD_PLATFORM_MESA)
-    add_subdirectory(mesa/)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
+  add_subdirectory(mesa/)
 endif()
 
 if (MIR_BUILD_PLATFORM_ANDROID)

=== modified file 'src/platforms/mesa/server/CMakeLists.txt'
--- src/platforms/mesa/server/CMakeLists.txt	2015-06-01 18:30:51 +0000
+++ src/platforms/mesa/server/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -1,5 +1,5 @@
 add_subdirectory(common/)
 
-if (MIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
   add_subdirectory(kms/)
 endif()

=== modified file 'src/platforms/mesa/server/kms/CMakeLists.txt'
--- src/platforms/mesa/server/kms/CMakeLists.txt	2015-06-01 18:30:51 +0000
+++ src/platforms/mesa/server/kms/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -17,7 +17,7 @@
 add_definitions(-D__GBM__)
 
 add_library(
-  mirplatformgraphicsmesaobjects OBJECT
+  mirplatformgraphicsmesakmsobjects OBJECT
 
   bypass.cpp
   cursor.cpp
@@ -34,13 +34,13 @@
 )
 
 add_library(
-  mirplatformgraphicsmesa MODULE
+  mirplatformgraphicsmesakms MODULE
 
-  $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects>
+  $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
 )
 
 target_link_libraries(
-  mirplatformgraphicsmesa
+  mirplatformgraphicsmesakms
   PRIVATE
   mirplatform
   mirsharedmesaservercommon-static
@@ -54,12 +54,12 @@
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(
-  mirplatformgraphicsmesa PROPERTIES
-  OUTPUT_NAME graphics-mesa
+  mirplatformgraphicsmesakms PROPERTIES
+  OUTPUT_NAME graphics-mesa-kms
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
   PREFIX ""
   SUFFIX ".so.${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
-install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
+install(TARGETS mirplatformgraphicsmesakms LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})

=== modified file 'src/platforms/mesa/server/kms/platform.cpp'
--- src/platforms/mesa/server/kms/platform.cpp	2015-05-28 21:16:37 +0000
+++ src/platforms/mesa/server/kms/platform.cpp	2015-06-04 17:06:35 +0000
@@ -231,7 +231,7 @@
 }
 
 mir::ModuleProperties const description = {
-    "mesa",
+    "mesa-kms",
     MIR_VERSION_MAJOR,
     MIR_VERSION_MINOR,
     MIR_VERSION_MICRO

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ tests/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -35,8 +35,8 @@
   add_definitions(-DMIR_BUILD_PLATFORM_ANDROID)
 endif()
 
-if (MIR_BUILD_PLATFORM_MESA)
-  add_definitions(-DMIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
+  add_definitions(-DMIR_BUILD_PLATFORM_MESA_KMS)
 endif()
 
 include_directories(

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -46,7 +46,7 @@
   test_surface_placement.cpp
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
+if (MIR_TEST_PLATFORM STREQUAL "mesa-kms")
   list(APPEND SOURCES test_symbols_required_by_mesa.cpp)
 endif()
 

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2015-06-03 12:07:08 +0000
+++ tests/integration-tests/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -52,7 +52,7 @@
   add_subdirectory(graphics/android)
 endif()
 
-if(MIR_TEST_PLATFORM STREQUAL "mesa")
+if(MIR_TEST_PLATFORM STREQUAL "mesa-kms")
   include_directories(
     ${DRM_INCLUDE_DIRS}
     ${GBM_INCLUDE_DIRS}
@@ -116,7 +116,7 @@
   ${MIR_SERVER_REFERENCES}
 )
 
-if (MIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
 target_link_libraries(mir_integration_tests
   mirsharedmesaservercommon-static
 )

=== modified file 'tests/integration-tests/graphics/mesa/CMakeLists.txt'
--- tests/integration-tests/graphics/mesa/CMakeLists.txt	2015-01-21 07:34:50 +0000
+++ tests/integration-tests/graphics/mesa/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -1,7 +1,7 @@
 list(
   APPEND INTEGRATION_TESTS_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
-  $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects>
+  $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
 )
 
 set(

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2015-05-28 21:16:37 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -32,7 +32,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp
 )
 
-if (MIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
   include_directories(
     ${PROJECT_SOURCE_DIR}/src/platforms/mesa/server/common
     ${DRM_INCLUDE_DIRS}

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-05-28 21:16:37 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -6,8 +6,8 @@
   add_definitions(-DMIR_BUILD_PLATFORM_ANDROID)
 endif()
 
-if (MIR_BUILD_PLATFORM_MESA)
-  add_definitions(-DMIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
+  add_definitions(-DMIR_BUILD_PLATFORM_MESA_KMS)
 endif()
 
 include_directories(
@@ -135,7 +135,7 @@
   ${XKBCOMMON_LIBRARIES}
 )
 
-if (MIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
 target_link_libraries(mir_unit_tests
   mirsharedmesaservercommon-static
 )

=== modified file 'tests/unit-tests/client/CMakeLists.txt'
--- tests/unit-tests/client/CMakeLists.txt	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/client/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -22,7 +22,7 @@
   add_subdirectory("android")
 endif()
 
-if(MIR_TEST_PLATFORM STREQUAL "mesa")
+if(MIR_TEST_PLATFORM STREQUAL "mesa-kms")
   add_subdirectory("mesa")
 endif()
 

=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp	2015-05-07 09:06:20 +0000
+++ tests/unit-tests/client/test_client_platform.cpp	2015-06-04 17:06:35 +0000
@@ -93,7 +93,7 @@
 
 #endif
 
-#ifdef MIR_BUILD_PLATFORM_MESA
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
 ClientPlatformTraits const mesa_platform{"mesa",
                                          [](MirPlatformPackage& pkg)
                                          {

=== modified file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
--- tests/unit-tests/client/test_probing_client_platform_factory.cpp	2015-05-07 09:06:20 +0000
+++ tests/unit-tests/client/test_probing_client_platform_factory.cpp	2015-06-04 17:06:35 +0000
@@ -35,7 +35,7 @@
 all_available_modules()
 {
     std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
-#ifdef MIR_BUILD_PLATFORM_MESA
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
     modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("mesa")));
 #endif
 #ifdef MIR_BUILD_PLATFORM_ANDROID
@@ -73,7 +73,7 @@
                  std::runtime_error);
 }
 
-#ifdef MIR_BUILD_PLATFORM_MESA
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
 TEST(ProbingClientPlatformFactory, CreatesMesaPlatformWhenAppropriate)
 #else
 TEST(ProbingClientPlatformFactory, DISABLED_CreatesMesaPlatformWhenAppropriate)

=== modified file 'tests/unit-tests/graphics/CMakeLists.txt'
--- tests/unit-tests/graphics/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ tests/unit-tests/graphics/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -23,7 +23,7 @@
 add_subdirectory(android/)
 endif()
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
+if (MIR_TEST_PLATFORM STREQUAL "mesa-kms")
 add_subdirectory(mesa/)
 endif()
 

=== modified file 'tests/unit-tests/graphics/mesa/CMakeLists.txt'
--- tests/unit-tests/graphics/mesa/CMakeLists.txt	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/CMakeLists.txt	2015-06-04 17:06:35 +0000
@@ -17,7 +17,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_bypass.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_ipc_operations.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_authentication.cpp
-  $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects>
+  $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
 )
 
 set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)

=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2015-05-29 16:16:20 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2015-06-04 17:06:35 +0000
@@ -304,7 +304,7 @@
 {
     mtf::UdevEnvironment udev_environment;
 
-    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa")};
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
 }
@@ -315,7 +315,7 @@
 
     udev_environment.add_standard_device("standard-drm-devices");
 
-    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa")};
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::best, probe());
 }

=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	2015-05-07 09:06:20 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2015-06-04 17:06:35 +0000
@@ -23,7 +23,7 @@
 
 #include "mir/raii.h"
 
-#ifdef MIR_BUILD_PLATFORM_MESA
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
 #include "mir_test_doubles/mock_drm.h"
 #include "mir_test_doubles/mock_gbm.h"
 #endif
@@ -46,8 +46,8 @@
 {
     std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
 
-#ifdef MIR_BUILD_PLATFORM_MESA
-    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-mesa")));
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-mesa-kms")));
 #endif
 #ifdef MIR_BUILD_PLATFORM_ANDROID
     modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-android")));
@@ -108,7 +108,7 @@
                  std::runtime_error);
 }
 
-#ifdef MIR_BUILD_PLATFORM_MESA
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
 TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
 {
     using namespace testing;
@@ -123,7 +123,7 @@
     auto descriptor = module->load_function<mir::graphics::DescribeModule>(describe_module);
     auto description = descriptor();
 
-    EXPECT_THAT(description->name, HasSubstr("mesa"));
+    EXPECT_THAT(description->name, HasSubstr("mesa-kms"));
 }
 #endif
 

=== modified file 'tools/run_abi_compliance_checker.sh'
--- tools/run_abi_compliance_checker.sh	2015-06-03 22:10:24 +0000
+++ tools/run_abi_compliance_checker.sh	2015-06-04 17:06:35 +0000
@@ -9,7 +9,7 @@
     ["mirclientplatformandroid"]="MIR_CLIENT_PLATFORM_ABI" \
     ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
     ["mirplatformgraphicsandroid"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
-    ["mirplatformgraphicsmesa"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" )
+    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" )
 
 print_help_and_exit()
 {

=== modified file 'tools/update_package_abis.sh'
--- tools/update_package_abis.sh	2015-03-06 09:05:54 +0000
+++ tools/update_package_abis.sh	2015-06-04 17:06:35 +0000
@@ -19,7 +19,7 @@
     mir-client-platform-android:MIR_CLIENT_PLATFORM_ABI \
     mir-client-platform-mesa:MIR_CLIENT_PLATFORM_ABI \
     mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
-    mir-platform-graphics-mesa:MIR_SERVER_GRAPHICS_PLATFORM_ABI"
+    mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI"
 
 package_name()
 {
@@ -210,7 +210,11 @@
         local result="$(echo "${packages}" | grep -v "\b${p}:")"
         if [ -n "$result" ];
         then
-            report_unknown_package "debian/control contains versioned package ${p} but it is unknown to this script"
+            local replaces_pkgs="$(grep "Replaces:" debian/control | cut -d ":" -f 2 | cut -d " " -f 2 | grep "[[:digit:]]" | tr -d ' [0-9]')"
+            if [ -z "$replaces_pkgs" ];
+            then
+                report_unknown_package "debian/control contains versioned package ${p} but it is unknown to this script"
+            fi
         fi
     done