Merge lp:~achiang/ubuntu-seeds/ubuntu-touch.utopic into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.utopic
- ubuntu-touch.utopic
- Merge into ubuntu-touch.utopic
Status: | Merged |
---|---|
Merged at revision: | 219 |
Proposed branch: | lp:~achiang/ubuntu-seeds/ubuntu-touch.utopic |
Merge into: | lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.utopic |
Diff against target: |
536 lines (+179/-233) 5 files modified
STRUCTURE (+4/-2) desktop (+2/-90) touch (+2/-141) touch-android (+44/-0) touch-core (+127/-0) |
To merge this branch: | bzr merge lp:~achiang/ubuntu-seeds/ubuntu-touch.utopic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Core Development Team | Pending | ||
Review via email: mp+224738@code.launchpad.net |
Commit message
Description of the change
Factor out core and android packages
Take first step in trying to define a common core across future Ubuntu
devices by defining two new seeds and metapackages:
- ubuntu-touch-core
- ubuntu-
And make existing ubuntu-desktop-next and ubuntu-touch depend on them
as needed.
We need separate 'core' and 'android' seeds because 'touch' can run on
both armhf and x86, and therefore cannot make any architecture assumptions.
At the same time, we do not want to pull android/hybris related packages
into 'desktop-next'. Hence, the above split.
###
Note: I'm hoping to get a careful review of the STRUCTURE file to ensure I defined the two new seeds correctly. I am never entirely sure how the inheritance of the STRUCTURE file works. Since touch inherits from 'core' and 'android', and that desktop inherits from 'core', I would have expected the change in the metapackage to be smaller.
I also did not expect that I would have to manually add ubuntu-touch-core and ubuntu-
But I think germinate tries to be smart about overlapping packages or something, and that is why the debdiff is huge:
http://
In any case, feedback is appreciated.
Thanks.
Colin Watson (cjwatson) wrote : | # |
Oliver Grawert (ogra) wrote : | # |
that split will not work in many areas due to code having dependencies on android bits so you wouldnt be able to run -core standalone at all (there are apps in core that user the android property system (see mtp-server) or talk to the android layer via sockets, etc etc). while i agree we should have a finer grained seed setup to make running bits and pieces without android possible i dont see why this has to happen before RTM.
if we actually want to make use of it there will be a lot of code changes and additional abstraction needed that nobody will be able to invest time into right now.
could this wait til after RTM ?
- 210. By Alex Chiang
-
rename core and android seeds; do not create metapackage for touch-android
Responding to code review comments:
- mv core => touch-core
- mv android => touch-androidtouch-android does not need its own task/metapackag
e/etc. because we
never expect to use it standalone.Do not repeat transitive inheritance in STRUCTURE.
Alex Chiang (achiang) wrote : | # |
Colin, thanks for the review comments. I have made some changes in r210.
However, I now get behavior I don't entirely understand. As you can see in STRUCTURE, touch now inherits from both touch-android and touch-core. I also realized that no one would ever install touch-android as a standalone thing, so there is no need for it to be a metapackage. Therefore, I removed that stanza from d/control.
When I build the metapackage, I get the below debdiff. Note that neither the ubuntu-touch nor ubuntu-desktop-next stanzas appear in the debdiff; this is because I removed the explicit Depends on ubuntu-touch-core.
http://
Upon inspecting the binary package though, I see:
http://
None of the packages appear in the Depends: line (as I would have expected from seed inheritance; see line 12 of diff below). Nor does ubuntu-touch-core appear as a Depends (but that is expected, since I did not list it as an explicit Depends).
So what am I doing wrong?
###
Oliver, since touch-core now inherits from touch-android, I think that does make it possible to run touch-core standalone.
Regarding the mtp-server package, it was seeded into 'desktop-next' before I even touched it. Is that an issue?
Regarding waiting until post-RTM, that is not possible, as we have other projects (some commercial, some internal) in-flight that will be built upon this split. So we need to parallelize.
At the end of the day, this change *must* be transparent to the phone image; if it is not, that is a bug and must be fixed. I hesitate to say this is "just" refactoring, but the changes should be straightforward enough that we can inspect the diffs closely and reason about them in our minds, along with careful testing to ensure no regressions for phone.
Thanks.
Colin Watson (cjwatson) wrote : | # |
The behaviour for touch-core seems fine. For touch-android, though, I see two mistakes:
* You should not list touch-android in ubuntu-
* You need to help out germinate-
This should make the metapackage contents work out better. Let me know if it doesn't.
- 211. By Alex Chiang
-
desktop/touch: add Task-Seeds: header
Declaring the inheritance in STRUCTURE does not transmit the knowledge
to germinate-update- metapackage, which reads the information out of the
header paragraph of the seed.Add the declaration so that the metapackages are generated properly.
- 212. By Alex Chiang
-
Merge with upstream:
Oliver Grawert 2014-07-07 drop valgrind again, it pulls in libc6-dbg whi...
Oliver Grawert 2014-07-07 add merge https://code.launchpad .net/~pope...
Oliver Grawert 2014-07-01 add dbus-property-service to the container...
Ricardo Salveti ... 2014-07-01 Updating libubuntu-location- service s...
Oliver Grawert 2014-06-27 add libqt5keychain0 to sdk-libs
Alex Chiang (achiang) wrote : | # |
Colin, thank you for the comments. I made changes as you suggested, re-merged with upstream, and verified that adding the Task-Seeds: line to the header paragraph produced the desired output in the metapackage (ubuntu-
Oliver,
The utopic archive currently has ubuntu-touch-meta (1.163).
After my changes to the seed and rebuilding the metapackage, I produced this debdiff:
http://
As you can see, the only real change was that the debug tools have been added to the ubuntu-desktop-next metapackage, as they are included in the touch-core seed. I believe this is harmless at worst and advantageous at best.
I also built the binary packages locally, and inspected the output, which is quite clean:
http://
At this point, I believe everything looks sane, and the branch is ready for merge and the new metapackage is ready for upload.
Can a core-dev merge this in and do the upload for me?
Thanks.
Alex Chiang (achiang) wrote : | # |
To be complete, I also built and tested in an armhf chroot.
http://
And here are the contents of one of the *.info files:
http://
Note that the Android packages did indeed make it into the metapackage.
Iain Lane (laney) wrote : | # |
Thanks. I'm basing this review on your diff. The concept is sound and the only problem I notice is that we don't want to have ubuntu-
- 213. By Alex Chiang
-
Merge with upstream
pending merges:
Steve Langasek 2014-07-11 [merge] Merge lp:~robru/ubuntu-seeds/deseed-fr...
Robert Bruce Park 2014-07-11 De-seed friends-app and move qtdeclarat... - 214. By Alex Chiang
-
Move ubuntu-
touch-session into touch, out of touch-core We don't want to have ubuntu-
touch-session on desktop since it overrides
some conditions from the packages themselves.
Alex Chiang (achiang) wrote : | # |
Thank you, Iain. I have (again, re-)merged with upstream, and moved ubuntu-
This is the debdiff:
http://
This is inspecting the binary package (amd64):
http://
This is inspecting the binary package (armhf):
http://
I believe I've addressed all the comments now, and think this is ready to land. I'll need some help with that from a core-dev.
Please let me know.
Thanks all!
Loïc Minier (lool) wrote : | # |
I've tested the branch and confirmed that with current meta it doesn't change any of the ubuntu-touch .deb deps; it only changes the desktop-next packages and the changes are ok (adding these debug / utils packages; we'll probably want to drop them eventually, but not a big deal for now).
The only thing which stopped me from merging is the "core" name when it actually lists a bunch of things that are common to desktop next / touch phone / images with UI but wouldn't necessarily be suitable on an image for UI less devices.
Perhaps the name core is confusing there and we should use touch-common or such?
Cheers,
Alex Chiang (achiang) wrote : | # |
To get this landed, I am +1 to s/core/common/ both in the developer-only
seed names and the user-visible metapackage
Thanks.
On Thu, Jul 17, 2014 at 12:49 PM, Loïc Minier <email address hidden>
wrote:
> I've tested the branch and confirmed that with current meta it doesn't
> change any of the ubuntu-touch .deb deps; it only changes the desktop-next
> packages and the changes are ok (adding these debug / utils packages; we'll
> probably want to drop them eventually, but not a big deal for now).
>
> The only thing which stopped me from merging is the "core" name when it
> actually lists a bunch of things that are common to desktop next / touch
> phone / images with UI but wouldn't necessarily be suitable on an image for
> UI less devices.
>
> Perhaps the name core is confusing there and we should use touch-common or
> such?
>
> Cheers,
> --
>
> https:/
> You are the owner of lp:~achiang/ubuntu-seeds/ubuntu-touch.utopic.
>
Preview Diff
1 | === modified file 'STRUCTURE' |
2 | --- STRUCTURE 2014-05-21 14:11:11 +0000 |
3 | +++ STRUCTURE 2014-07-15 18:51:39 +0000 |
4 | @@ -3,8 +3,10 @@ |
5 | sdk-libs: minimal |
6 | sdk-libs-dev: sdk-libs minimal |
7 | sdk: sdk-libs-dev |
8 | -touch: minimal sdk-libs |
9 | -desktop: minimal sdk-libs |
10 | +touch-android: minimal |
11 | +touch-core: minimal sdk-libs |
12 | +touch: touch-android touch-core |
13 | +desktop: touch-core |
14 | live: desktop live-common |
15 | ship-live: boot live |
16 | supported: touch desktop ship-live |
17 | |
18 | === modified file 'desktop' |
19 | --- desktop 2014-07-11 22:52:28 +0000 |
20 | +++ desktop 2014-07-15 18:51:39 +0000 |
21 | @@ -5,21 +5,14 @@ |
22 | Task-Key: ubuntu-desktop-next |
23 | Task-Name: ubuntu-desktop-next |
24 | Task-Metapackage: ubuntu-desktop-next |
25 | +Task-Seeds: touch-core |
26 | |
27 | == Core == |
28 | |
29 | - * isc-dhcp-client |
30 | - * net-tools |
31 | - * network-manager |
32 | - * bluez |
33 | - * ca-certificates |
34 | - * alsa-base |
35 | - * alsa-utils |
36 | * ttf-ubuntu-font-family |
37 | * fonts-freefont-ttf |
38 | * fonts-dejavu-extra |
39 | * fonts-arphic-ukai |
40 | - * powerd |
41 | * ubuntu-keyboard-english |
42 | * ubuntu-keyboard-arabic |
43 | * ubuntu-keyboard-chinese-pinyin |
44 | @@ -37,76 +30,18 @@ |
45 | * ubuntu-keyboard-russian |
46 | * ubuntu-keyboard-spanish |
47 | * ubuntu-keyboard-swedish |
48 | - * qtdeclarative5-friends0.2 |
49 | - * friends-facebook |
50 | - * friends-twitter |
51 | - * telepathy-gabble |
52 | - * libmessaging-menu0 |
53 | - * signon-plugin-oauth2 |
54 | - * python3-gi |
55 | - * python3-pkg-resources |
56 | - * python3-oauthlib |
57 | - * gir1.2-accounts-1.0 |
58 | * account-plugin-tools |
59 | * account-plugin-twitter |
60 | * account-plugin-facebook |
61 | * account-plugin-evernote |
62 | * suru-icon-theme |
63 | - * software-properties-common |
64 | - * mobile-broadband-provider-info |
65 | - * system-image-cli |
66 | - * click |
67 | - * packagekit |
68 | - * packagekit-plugin-click |
69 | - * click-apparmor |
70 | - * ufw |
71 | - * wget |
72 | - * bluetooth-touch |
73 | - * pulseaudio |
74 | - * pulseaudio-module-bluetooth |
75 | - * rtkit |
76 | - * content-hub |
77 | - * libubuntu-location-service1 |
78 | - * ubuntu-location-service-bin |
79 | - * mtp-server |
80 | * account-plugin-ubuntuone |
81 | * account-plugin-google |
82 | -# Plugin for showing camera viewfinder in Qt as well as the video surface in |
83 | -# the media-player |
84 | - * qtvideonode-plugin |
85 | -# Library that coordinates qtvideo-node, qtubuntu-camera and qtubuntu-media |
86 | -# across thread contexts. |
87 | - * libqtubuntu-media-signals1 |
88 | - # can take advantage to fine-tune removals; also useful for debugging |
89 | - * ubuntu-app-launch-tools |
90 | - * usensord |
91 | - * libtinyxml2-2 # camera/gallery |
92 | - * libzen0 # camera/gallery |
93 | - * ubuntu-push-client |
94 | |
95 | To provide a way to log in; as thing stand this will install X11 |
96 | * lightdm |
97 | * unity-greeter |
98 | |
99 | -== Utilities == |
100 | - |
101 | -For pkcon: |
102 | - * packagekit-tools |
103 | - |
104 | -== Multimedia == |
105 | - |
106 | - * gstreamer1.0-pulseaudio |
107 | - * gstreamer1.0-fluendo-mp3 # MP3 support |
108 | - * gstreamer1.0-plugins-good |
109 | - * gstreamer0.10-plugins-good # camera/gallery |
110 | - * gstreamer1.0-plugins-bad-faad # for h264parse/faad / streaming |
111 | - * gstreamer1.0-plugins-bad-videoparsers # for h264parse/faad / streaming |
112 | - * media-hub # centralized media playback |
113 | - * qtubuntu-media # for media-hub |
114 | - * libexiv2-12 # camera/gallery |
115 | - * libmediainfo0 # camera/gallery |
116 | - * libqtubuntu-media-signals1 # camera/gallery |
117 | - |
118 | == Shell == |
119 | |
120 | * unity8 |
121 | @@ -159,34 +94,11 @@ |
122 | * ubuntu-touch-sounds |
123 | * ubuntu-artwork |
124 | |
125 | -== Debug == |
126 | - |
127 | - * nano |
128 | - * wireless-tools |
129 | - * openssh-server |
130 | -# Tools added for debugging which should be removed in non-developer builds |
131 | - * strace |
132 | - * lsof |
133 | - * ltrace |
134 | - * tcptraceroute |
135 | - |
136 | == Testing == |
137 | |
138 | -# Spell out actuall autopilot packages needed & used |
139 | - |
140 | - * autopilot-touch # for a single apparmor click.rules files |
141 | - * libautopilot-qt # for qttestability and the qt5 autopilot compiled modules |
142 | - * python3-autopilot # to execute python3 based autopilot tests |
143 | - * python3-evdev # to execute python3 based autopilot tests |
144 | +# Spell out actual autopilot packages needed & used |
145 | * python-autopilot # to execute python2 based autopilot tests |
146 | * python-evdev # to execute python2 based autopilot tests |
147 | - * fbset # to dynamically detect framebuffer / screen size |
148 | - |
149 | -== Error Reporting == |
150 | - |
151 | - * whoopsie |
152 | - * apport |
153 | - * apport-noui |
154 | |
155 | == language support == |
156 | # we use the -gnome-*-base packages here for indicator translations |
157 | |
158 | === modified file 'touch' |
159 | --- touch 2014-07-11 22:52:28 +0000 |
160 | +++ touch 2014-07-15 18:51:39 +0000 |
161 | @@ -5,40 +5,16 @@ |
162 | Task-Key: ubuntu-touch |
163 | Task-Name: ubuntu-touch |
164 | Task-Metapackage: ubuntu-touch |
165 | +Task-Seeds: touch-android touch-core |
166 | |
167 | * Feature: no-follow-recommends |
168 | |
169 | -== Core Device Specific == |
170 | - |
171 | -# Here we list _preffered_ alternatives. These must be specified |
172 | -# first, otherwise packages that depend on alternatives can pull in |
173 | -# the wrong one (e.g. X11 or mesa based ones) |
174 | - |
175 | -# Touch uses the android-based mir platform backend by default |
176 | - * libmirclientplatform-android |
177 | - * libmirplatformgraphics-android |
178 | - |
179 | - |
180 | == Core == |
181 | |
182 | - * libhybris |
183 | - * libhybris-test |
184 | - * libhybris-utils |
185 | -# Copyrights of the AOSP portion of the image |
186 | - * android-copyright |
187 | - * isc-dhcp-client |
188 | - * net-tools |
189 | - * network-manager |
190 | - * bluez |
191 | - * ca-certificates |
192 | - * alsa-base |
193 | - * alsa-utils |
194 | * ttf-ubuntu-font-family |
195 | * fonts-freefont-ttf |
196 | * fonts-dejavu-extra |
197 | * fonts-arphic-ukai |
198 | - * ubuntu-touch-session |
199 | - * powerd |
200 | * ubuntu-keyboard-english |
201 | * ubuntu-keyboard-arabic |
202 | * ubuntu-keyboard-chinese-pinyin |
203 | @@ -56,77 +32,17 @@ |
204 | * ubuntu-keyboard-russian |
205 | * ubuntu-keyboard-spanish |
206 | * ubuntu-keyboard-swedish |
207 | - * urfkill |
208 | - * qtdeclarative5-friends0.2 |
209 | - * friends-facebook |
210 | - * friends-twitter |
211 | - * telepathy-gabble |
212 | - * libmessaging-menu0 |
213 | - * signon-plugin-oauth2 |
214 | - * python3-gi |
215 | - * python3-pkg-resources |
216 | - * python3-oauthlib |
217 | - * gir1.2-accounts-1.0 |
218 | * account-plugin-tools |
219 | * account-plugin-twitter |
220 | * account-plugin-facebook |
221 | * account-plugin-evernote |
222 | * suru-icon-theme |
223 | - * software-properties-common |
224 | - * mobile-broadband-provider-info |
225 | - * system-image-cli |
226 | - * click |
227 | - * packagekit |
228 | - * packagekit-plugin-click |
229 | - * click-apparmor |
230 | - * ufw |
231 | - * wget |
232 | - * bluetooth-touch |
233 | - * ubuntu-touch-customization-hooks |
234 | - * pulseaudio |
235 | - * pulseaudio-module-bluetooth |
236 | - * pulseaudio-module-droid |
237 | - * rtkit |
238 | - * content-hub |
239 | - * libubuntu-location-service1 |
240 | - * ubuntu-location-service-bin |
241 | - * mtp-server |
242 | * account-plugin-ubuntuone |
243 | * account-plugin-google |
244 | -# A QtMultimedia camera plugin that talks to Android by using hybris |
245 | - * cameraplugin-aal |
246 | -# Plugin for showing camera viewfinder in Qt as well as the video surface in |
247 | -# the media-player |
248 | - * qtvideonode-plugin |
249 | -# Library that coordinates qtvideo-node, qtubuntu-camera and qtubuntu-media |
250 | -# across thread contexts. |
251 | - * libqtubuntu-media-signals1 |
252 | - # can take advantage to fine-tune removals; also useful for debugging |
253 | - * ubuntu-app-launch-tools |
254 | - * usensord |
255 | - * libtinyxml2-2 # camera/gallery |
256 | - * libzen0 # camera/gallery |
257 | - * ubuntu-push-client |
258 | -# MMS support |
259 | - * nuntium |
260 | - |
261 | -== Multimedia == |
262 | - |
263 | - * gstreamer1.0-pulseaudio |
264 | - * gstreamer1.0-fluendo-mp3 # MP3 support |
265 | - * gstreamer1.0-plugins-good |
266 | - * gstreamer0.10-plugins-good # camera/gallery |
267 | - * gstreamer1.0-plugins-bad-faad # for h264parse/faad / streaming |
268 | - * gstreamer1.0-plugins-bad-videoparsers # for h264parse/faad / streaming |
269 | - * gstreamer1.0-hybris |
270 | - * media-hub # centralized media playback |
271 | - * qtubuntu-media # for media-hub |
272 | - * libexiv2-12 # camera/gallery |
273 | - * libmediainfo0 # camera/gallery |
274 | - * libqtubuntu-media-signals1 # camera/gallery |
275 | |
276 | == Shell == |
277 | |
278 | + * ubuntu-touch-session |
279 | * unity8 |
280 | * indicator-bluetooth |
281 | * indicator-datetime |
282 | @@ -145,7 +61,6 @@ |
283 | == Apps == |
284 | |
285 | * hud |
286 | - * qtubuntu-android |
287 | * webbrowser-app |
288 | * webapp-container # container |
289 | * dialer-app |
290 | @@ -162,65 +77,11 @@ |
291 | * policykit-desktop-privileges |
292 | * qtorganizer5-eds |
293 | * unity-webapps-qml |
294 | - * pay-service |
295 | |
296 | == Themes == |
297 | |
298 | * ubuntu-touch-sounds |
299 | |
300 | -== Debug == |
301 | - |
302 | - * nano |
303 | - * wireless-tools |
304 | - * openssh-server |
305 | - * smemstat |
306 | - * forkstat |
307 | - * cpustat |
308 | - * eventstat |
309 | - * powerstat |
310 | - * health-check |
311 | -# Tools added for debugging which should be removed in non-developer builds |
312 | - * strace |
313 | - * lsof |
314 | - * ltrace |
315 | - * tcptraceroute |
316 | - |
317 | -== Utils == |
318 | - |
319 | - * ofono-scripts |
320 | - * mir-utils # screencast |
321 | - * packagekit-tools |
322 | - * pulseaudio-utils # pactl |
323 | - |
324 | -== Testing == |
325 | - |
326 | -# Spell out actuall autopilot packages needed & used |
327 | - * autopilot-touch # for a single apparmor click.rules files |
328 | - * libautopilot-qt # for qttestability and the qt5 autopilot compiled modules |
329 | - * python3-autopilot # to execute python3 based autopilot tests |
330 | - * python3-evdev # to execute python3 based autopilot tests |
331 | - * fbset # to dynamically detect framebuffer / screen size |
332 | - |
333 | -# Mir testing utils |
334 | - * mir-test-tools |
335 | - |
336 | -# Platform API testing utils (sensors, gps, etc) |
337 | - * ubuntu-application-api2-examples |
338 | - |
339 | -== Container Related == |
340 | - |
341 | - * initramfs-tools-ubuntu-touch |
342 | - * ubuntu-touch-generic-initrd [armhf] |
343 | - * android-tools-adbd |
344 | - * lxc-android-config |
345 | - * dbus-property-service |
346 | - |
347 | -== Error Reporting == |
348 | - |
349 | - * whoopsie |
350 | - * apport |
351 | - * apport-noui |
352 | - |
353 | == language support == |
354 | # these are trimmed for the touch seeds and only get built if they have at |
355 | # least 70% coverage, so we want them all |
356 | |
357 | === added file 'touch-android' |
358 | --- touch-android 1970-01-01 00:00:00 +0000 |
359 | +++ touch-android 2014-07-15 18:51:39 +0000 |
360 | @@ -0,0 +1,44 @@ |
361 | +The touch-android seed exists to allow sharing a common touch-core between |
362 | +touch and desktop-next without pulling Android-specific bits into desktop-next. |
363 | +It does not have an associated metapackage as it is not expected to be |
364 | +installable on its own. |
365 | + |
366 | + * Feature: no-follow-recommends |
367 | + |
368 | +== Core Device Specific == |
369 | + |
370 | +# Here we list _preferred_ alternatives. These must be specified |
371 | +# first, otherwise packages that depend on alternatives can pull in |
372 | +# the wrong one (e.g. X11 or mesa based ones) |
373 | + |
374 | +# Touch uses the android-based mir platform backend by default |
375 | + * libmirclientplatform-android |
376 | + * libmirplatformgraphics-android |
377 | + |
378 | +== Core == |
379 | + |
380 | + * libhybris |
381 | + * libhybris-test |
382 | + * libhybris-utils |
383 | +# Copyrights of the AOSP portion of the image |
384 | + * android-copyright |
385 | + |
386 | +== Multimedia == |
387 | + |
388 | +# A QtMultimedia camera plugin that talks to Android by using hybris |
389 | + * cameraplugin-aal |
390 | + * gstreamer1.0-hybris |
391 | + * pulseaudio-module-droid |
392 | + |
393 | +== Apps == |
394 | + |
395 | + * qtubuntu-android |
396 | + |
397 | +== Container Related == |
398 | + |
399 | + * initramfs-tools-ubuntu-touch |
400 | + * ubuntu-touch-generic-initrd [armhf] |
401 | + * android-tools-adbd |
402 | + * lxc-android-config |
403 | + * dbus-property-service |
404 | + |
405 | |
406 | === added file 'touch-core' |
407 | --- touch-core 1970-01-01 00:00:00 +0000 |
408 | +++ touch-core 2014-07-15 18:51:39 +0000 |
409 | @@ -0,0 +1,127 @@ |
410 | +Task-Per-Derivative: 1 |
411 | +Task-Section: user |
412 | +Task-Description: Ubuntu touch core |
413 | +Task-Extended-Description: This task provides the core Ubuntu touch environment. |
414 | +Task-Key: ubuntu-touch-core |
415 | +Task-Name: ubuntu-touch-core |
416 | +Task-Metapackage: ubuntu-touch-core |
417 | + |
418 | + * Feature: no-follow-recommends |
419 | + |
420 | +== Core == |
421 | + |
422 | + * isc-dhcp-client |
423 | + * net-tools |
424 | + * network-manager |
425 | + * bluez |
426 | + * ca-certificates |
427 | + * alsa-base |
428 | + * alsa-utils |
429 | + * powerd |
430 | + * urfkill |
431 | + * qtdeclarative5-friends0.2 |
432 | + * friends-facebook |
433 | + * friends-twitter |
434 | + * telepathy-gabble |
435 | + * libmessaging-menu0 |
436 | + * signon-plugin-oauth2 |
437 | + * python3-gi |
438 | + * python3-pkg-resources |
439 | + * python3-oauthlib |
440 | + * gir1.2-accounts-1.0 |
441 | + * software-properties-common |
442 | + * mobile-broadband-provider-info |
443 | + * system-image-cli |
444 | + * click |
445 | + * packagekit |
446 | + * packagekit-plugin-click |
447 | + * click-apparmor |
448 | + * ufw |
449 | + * wget |
450 | + * bluetooth-touch |
451 | + * ubuntu-touch-customization-hooks |
452 | + * pulseaudio |
453 | + * pulseaudio-module-bluetooth |
454 | + * rtkit |
455 | + * content-hub |
456 | + * libubuntu-location-service1 |
457 | + * ubuntu-location-service-bin |
458 | + * mtp-server |
459 | +# Plugin for showing camera viewfinder in Qt as well as the video surface in |
460 | +# the media-player |
461 | + * qtvideonode-plugin |
462 | +# Library that coordinates qtvideo-node, qtubuntu-camera and qtubuntu-media |
463 | +# across thread contexts. |
464 | + * libqtubuntu-media-signals1 |
465 | + # can take advantage to fine-tune removals; also useful for debugging |
466 | + * ubuntu-app-launch-tools |
467 | + * usensord |
468 | + * libtinyxml2-2 # camera/gallery |
469 | + * libzen0 # camera/gallery |
470 | + * ubuntu-push-client |
471 | +# MMS support |
472 | + * nuntium |
473 | + |
474 | +== Multimedia == |
475 | + |
476 | + * gstreamer1.0-pulseaudio |
477 | + * gstreamer1.0-fluendo-mp3 # MP3 support |
478 | + * gstreamer1.0-plugins-good |
479 | + * gstreamer0.10-plugins-good # camera/gallery |
480 | + * gstreamer1.0-plugins-bad-faad # for h264parse/faad / streaming |
481 | + * gstreamer1.0-plugins-bad-videoparsers # for h264parse/faad / streaming |
482 | + * media-hub # centralized media playback |
483 | + * qtubuntu-media # for media-hub |
484 | + * libexiv2-12 # camera/gallery |
485 | + * libmediainfo0 # camera/gallery |
486 | + * libqtubuntu-media-signals1 # camera/gallery |
487 | + |
488 | +== Apps == |
489 | + |
490 | + * pay-service |
491 | + |
492 | +== Debug == |
493 | + |
494 | + * nano |
495 | + * wireless-tools |
496 | + * openssh-server |
497 | + * smemstat |
498 | + * forkstat |
499 | + * cpustat |
500 | + * eventstat |
501 | + * powerstat |
502 | + * health-check |
503 | +# Tools added for debugging which should be removed in non-developer builds |
504 | + * strace |
505 | + * lsof |
506 | + * ltrace |
507 | + * tcptraceroute |
508 | + |
509 | +== Utils == |
510 | + |
511 | + * ofono-scripts |
512 | + * mir-utils # screencast |
513 | + * packagekit-tools |
514 | + * pulseaudio-utils # pactl |
515 | + |
516 | +== Testing == |
517 | + |
518 | +# Spell out actual autopilot packages needed & used |
519 | + * autopilot-touch # for a single apparmor click.rules files |
520 | + * libautopilot-qt # for qttestability and the qt5 autopilot compiled modules |
521 | + * python3-autopilot # to execute python3 based autopilot tests |
522 | + * python3-evdev # to execute python3 based autopilot tests |
523 | + * fbset # to dynamically detect framebuffer / screen size |
524 | + |
525 | +# Mir testing utils |
526 | + * mir-test-tools |
527 | + |
528 | +# Platform API testing utils (sensors, gps, etc) |
529 | + * ubuntu-application-api2-examples |
530 | + |
531 | +== Error Reporting == |
532 | + |
533 | + * whoopsie |
534 | + * apport |
535 | + * apport-noui |
536 | + |
[I can't speak for the package-level details; this review is just
regarding the general seed structure.]
On Fri, Jun 27, 2014 at 01:01:21AM -0000, Alex Chiang wrote: touch-android as explicit Depends in
> I also did not expect that I would have to manually add
> ubuntu-touch-core and ubuntu-
> debian/control...
Historically, we intentionally haven't made the metapackages depend on
each other, because it makes it excessively painful when you want to
vary from (say) ubuntu-standard but you're quite happy with the contents
of ubuntu-desktop. We usually deal with ensuring that we have all the
right metapackages in livecd-rootfs or similar instead.
However, in the particular case of touch, it's probably OK to do this
using explicit Depends.
> But I think germinate tries to be smart about overlapping packages or something, and that is why the debdiff is huge: pastebin. ubuntu. com/7708769/
>
> http://
This all seems as expected. If you have packages in an inner seed (or expansion) , then they don't also need to show up in the
its dependency-
expansion of an outer seed. That's the whole point of seed inheritance.
> In any case, feedback is appreciated.
Please let's not have a seed called "core", anywhere. Vast confusion
with the existing core package set will result. Call it "touch-core",
perhaps. Ditto android -> touch-android. You're explicitly specifying
the task and metapackage names, so changing the seed names will be
harmless.
> -touch: minimal sdk-libs
> -desktop: minimal sdk-libs
> +android: minimal sdk-libs
> +core: minimal sdk-libs
> +touch: minimal sdk-libs android core
> +desktop: minimal sdk-libs core
There is no need to repeat the transitive inheritance, so this is
sufficient:
touch: touch-android touch-core
desktop: touch-core
Is it possible that touch-android should inherit from touch-core? If
you're never going to use touch-android without touch-core, then that
would save a lot of duplication of entries in Task fields.
> +Task-Per- Derivative: 1 Description: This task provides the Android-to-Ubuntu bridge touch-android touch-android touch-android
> +Task-Section: user
> +Task-Description: Ubuntu touch android
> +Task-Extended-
> +Task-Key: ubuntu-
> +Task-Name: ubuntu-
> +Task-Metapackage: ubuntu-
I'm not entirely sure why we bother to create a task for the current
touch seed at all; as far as I can see it isn't used, so it's just bloat
in the Packages file for no reason. However, maybe I've missed
something, so it's probably OK to add tasks for these. I might go round
and clean this up later.