Mir

Merge lp:~raof/mir/plugin-probe-packaging into lp:mir

  1. plugin-probe-packaging
  2. Merge into development-branch
Proposed by Chris Halse Rogers
Status: Work in progress
Proposed branch: lp:~raof/mir/plugin-probe-packaging
Merge into: lp:mir
Prerequisite: lp:~raof/mir/server-side-platform-probing
Diff against target: 204 lines (+59/-38) (has conflicts)
7 files modified
debian/control (+48/-30)
debian/mir-client-platform-android.install (+1/-1)
debian/mir-client-platform-mesa.install (+1/-1)
debian/mir-platform-graphics-android.install (+1/-1)
debian/mir-platform-graphics-mesa.install (+1/-1)
debian/mir-test-tools.install (+2/-1)
debian/rules (+5/-3)
Text conflict in debian/control
Text conflict in debian/rules
Text conflict in platform-ABI-sha1sums
Text conflict in server-ABI-sha1sums
Text conflict in tests/mir_test_framework/headless_test.cpp
Text conflict in tests/mir_test_framework/stubbed_graphics_platform.cpp
Text conflict in tests/mir_test_framework/testing_client_options.cpp
To merge this branch: bzr merge lp:~raof/mir/plugin-probe-packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+243006@code.launchpad.net

Commit message

Move the platform plugins into a private directory, versioned with the relevant ABI.

Description of the change

Add the Debian packaging for privatise-all-the-things.

This is the final branch of the series, and is the only one that should land.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2104
http://jenkins.qa.ubuntu.com/job/mir-ci/2279/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/348/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/348/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Chris Halse Rogers (raof) wrote :

Bah.

I don't know why Launchpad is failing at this. These branches *should* be stacked one on top of the other, but LP is confused.

Reply

Unmerged revisions

2104. By Chris Halse Rogers

Packaging for probable client/server platform plugins

2103. By Chris Halse Rogers

Oops. Add a whole bunch of accidentally missing files

2102. By Chris Halse Rogers

Move dummy modules alongside their regular counterparts

2101. By Chris Halse Rogers

Implement server-side graphics platform probe

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-11-27 03:48:20 +0000
3+++ debian/control 2014-11-27 07:06:39 +0000
4@@ -67,7 +67,11 @@
5 Pre-Depends: ${misc:Pre-Depends}
6 Depends: ${misc:Depends},
7 ${shlibs:Depends},
8+<<<<<<< TREE
9 libmir${platform-driver}-mesa | libmir${platform-driver}-android,
10+=======
11+ mir-platform-graphics-mesa | mir-platform-graphics-android,
12+>>>>>>> MERGE-SOURCE
13 Description: Display server for Ubuntu - server library
14 Mir is a display server running on linux systems, with a focus on efficiency,
15 robust operation and a well-defined driver model.
16@@ -144,7 +148,11 @@
17 Pre-Depends: ${misc:Pre-Depends}
18 Depends: ${misc:Depends},
19 ${shlibs:Depends},
20+<<<<<<< TREE
21 libmir${client-driver}-mesa | libmir${client-driver}-android,
22+=======
23+ mir-client-platform-mesa | mir-client-platform-android,
24+>>>>>>> MERGE-SOURCE
25 Description: Display server for Ubuntu - client library
26 Mir is a display server running on linux systems, with a focus on efficiency,
27 robust operation and a well-defined driver model.
28@@ -266,7 +274,35 @@
29 Contains the shared libraries required for the Mir server and client.
30
31 # Longer-term these drivers should move out-of-tree
32-Package: libmirclient8driver-mesa
33+Package: mir-platform-graphics-mesa
34+Section: libs
35+Architecture: i386 amd64 armhf arm64
36+Multi-Arch: same
37+Pre-Depends: ${misc:Pre-Depends}
38+Depends: ${misc:Depends},
39+ ${shlibs:Depends},
40+Description: Display server for Ubuntu - platform library for Mesa
41+ Mir is a display server running on linux systems, with a focus on efficiency,
42+ robust operation and a well-defined driver model.
43+ .
44+ Contains the shared libraries required for the Mir server to interact with
45+ the hardware platform using the Mesa drivers.
46+
47+Package: mir-platform-graphics-android
48+Section: libs
49+Architecture: i386 amd64 armhf
50+Multi-Arch: same
51+Pre-Depends: ${misc:Pre-Depends}
52+Depends: ${misc:Depends},
53+ ${shlibs:Depends},
54+Description: Display server for Ubuntu - platform library for Android
55+ Mir is a display server running on linux systems, with a focus on efficiency,
56+ robust operation and a well-defined driver model.
57+ .
58+ Contains the shared libraries required for the Mir server to interact with
59+ the hardware platform using the Android drivers.
60+
61+Package: mir-client-platform-mesa
62 Section: libs
63 Architecture: i386 amd64 armhf arm64
64 Multi-Arch: same
65@@ -280,7 +316,7 @@
66 Contains the shared libraries required for the Mir clients to interact with
67 the underlying hardware platform using the Mesa drivers.
68
69-Package: libmirclient8driver-android
70+Package: mir-client-platform-android
71 Section: libs
72 Architecture: i386 amd64 armhf
73 Multi-Arch: same
74@@ -294,42 +330,19 @@
75 Contains the shared libraries required for the Mir clients to interact with
76 the underlying hardware platform using the Android drivers.
77
78-Package: libmirplatform4driver-mesa
79-Section: libs
80-Architecture: i386 amd64 armhf arm64
81-Multi-Arch: same
82-Pre-Depends: ${misc:Pre-Depends}
83-Depends: ${misc:Depends},
84- ${shlibs:Depends},
85-Description: Display server for Ubuntu - platform library for Mesa
86- Mir is a display server running on linux systems, with a focus on efficiency,
87- robust operation and a well-defined driver model.
88- .
89- Contains the shared libraries required for the Mir server to interact with
90- the hardware platform using the Mesa drivers.
91-
92-Package: libmirplatform4driver-android
93-Section: libs
94-Architecture: i386 amd64 armhf
95-Multi-Arch: same
96-Pre-Depends: ${misc:Pre-Depends}
97-Depends: ${misc:Depends},
98- ${shlibs:Depends},
99-Description: Display server for Ubuntu - platform library for Android
100- Mir is a display server running on linux systems, with a focus on efficiency,
101- robust operation and a well-defined driver model.
102- .
103- Contains the shared libraries required for the Mir server to interact with
104- the hardware platform using the Android drivers.
105-
106 Package: mir-graphics-drivers-desktop
107 Section: libs
108 Architecture: i386 amd64 armhf arm64
109 Multi-Arch: same
110 Pre-Depends: ${misc:Pre-Depends}
111 Depends: ${misc:Depends},
112+<<<<<<< TREE
113 libmir${platform-driver}-mesa,
114 libmir${client-driver}-mesa
115+=======
116+ mir-platform-graphics-mesa,
117+ mir-client-platform-mesa,
118+>>>>>>> MERGE-SOURCE
119 Description: Display server for Ubuntu - desktop driver metapackage
120 Mir is a display server running on linux systems, with a focus on efficiency,
121 robust operation and a well-defined driver model.
122@@ -343,8 +356,13 @@
123 Multi-Arch: same
124 Pre-Depends: ${misc:Pre-Depends}
125 Depends: ${misc:Depends},
126+<<<<<<< TREE
127 libmir${platform-driver}-android,
128 libmir${client-driver}-android
129+=======
130+ mir-platform-graphics-android,
131+ mir-client-platform-android,
132+>>>>>>> MERGE-SOURCE
133 Description: Display server for Ubuntu - android driver metapackage
134 Mir is a display server running on linux systems, with a focus on efficiency,
135 robust operation and a well-defined driver model.
136
137=== renamed file 'debian/libmirclient8driver-android.install' => 'debian/mir-client-platform-android.install'
138--- debian/libmirclient8driver-android.install 2014-11-24 02:16:00 +0000
139+++ debian/mir-client-platform-android.install 2014-11-27 07:06:39 +0000
140@@ -1,1 +1,1 @@
141-usr/lib/*/mir/client*driver/android/*
142+usr/lib/*/mir/client-platform/android.so
143
144=== renamed file 'debian/libmirclient8driver-mesa.install' => 'debian/mir-client-platform-mesa.install'
145--- debian/libmirclient8driver-mesa.install 2014-11-24 02:16:00 +0000
146+++ debian/mir-client-platform-mesa.install 2014-11-27 07:06:39 +0000
147@@ -1,1 +1,1 @@
148-usr/lib/*/mir/client*driver/mesa/*
149+usr/lib/*/mir/client-platform/mesa.so
150
151=== renamed file 'debian/libmirplatform4driver-android.install' => 'debian/mir-platform-graphics-android.install'
152--- debian/libmirplatform4driver-android.install 2014-11-24 02:16:00 +0000
153+++ debian/mir-platform-graphics-android.install 2014-11-27 07:06:39 +0000
154@@ -1,1 +1,1 @@
155-usr/lib/*/mir/platform*driver/android/*
156+usr/lib/*/mir/server-platform/graphics-android.so
157
158=== renamed file 'debian/libmirplatform4driver-mesa.install' => 'debian/mir-platform-graphics-mesa.install'
159--- debian/libmirplatform4driver-mesa.install 2014-11-24 02:16:00 +0000
160+++ debian/mir-platform-graphics-mesa.install 2014-11-27 07:06:39 +0000
161@@ -1,1 +1,1 @@
162-usr/lib/*/mir/platform*driver/mesa/*
163+usr/lib/*/mir/server-platform/graphics-mesa.so
164
165=== modified file 'debian/mir-test-tools.install'
166--- debian/mir-test-tools.install 2014-11-24 02:16:00 +0000
167+++ debian/mir-test-tools.install 2014-11-27 07:06:39 +0000
168@@ -5,4 +5,5 @@
169 usr/bin/mir_performance_tests
170 usr/lib/*/mir/tools/libmirclientlttng.so
171 usr/lib/*/mir/tools/libmirserverlttng.so
172-usr/lib/*/libmirplatformstub.so
173+usr/lib/*/mir/client-platform/dummy.so
174+usr/lib/*/mir/server-platform/graphics-dummy.so
175
176=== modified file 'debian/rules'
177--- debian/rules 2014-11-27 03:48:20 +0000
178+++ debian/rules 2014-11-27 07:06:39 +0000
179@@ -13,9 +13,6 @@
180 export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
181 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
182
183-export PLATFORM_DRIVER = platform4driver
184-export CLIENT_DRIVER = client8driver
185-
186 %:
187 dh $@ --parallel --fail-missing
188
189@@ -57,6 +54,7 @@
190 # Nothing outside Mir should link to libmirprotobuf directly.
191 # Delete the symlink so that --fail-missing doesn't think we've missed it
192 # accidentally.
193+<<<<<<< TREE
194 rm debian/tmp/usr/lib/*/libmirprotobuf.so
195 dh_install --fail-missing \
196 -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so \
197@@ -72,3 +70,7 @@
198 dh_gencontrol -- \
199 -Vplatform-driver=$(PLATFORM_DRIVER) \
200 -Vclient-driver=$(CLIENT_DRIVER)
201+=======
202+ -rm debian/tmp/usr/lib/*/libmirprotobuf.so
203+ dh_install --fail-missing
204+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches