Merge lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate-base into lp:ubuntu-cdimage

Proposed by Martin Wimpress 
Status: Needs review
Proposed branch: lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate-base
Merge into: lp:ubuntu-cdimage
Diff against target: 354 lines (+60/-12)
12 files modified
bin/daily-checks (+3/-1)
etc/config (+1/-1)
etc/crontab (+2/-0)
etc/default-arches (+3/-0)
etc/qa-products (+9/-4)
lib/cdimage/build.py (+2/-0)
lib/cdimage/germinate.py (+2/-2)
lib/cdimage/project.py (+2/-0)
lib/cdimage/tests/test_build.py (+2/-0)
lib/cdimage/tests/test_germinate.py (+3/-0)
lib/cdimage/tests/test_tree.py (+8/-2)
lib/cdimage/tree.py (+23/-2)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate-base
Reviewer Review Type Date Requested Status
Adam Conrad Pending
Ubuntu CD Image Team Pending
Review via email: mp+284433@code.launchpad.net

Description of the change

This merge proposal adds support for Xubuntu Base and Ubuntu MATE Base as discussed with Adam Conrad. The "Base" variants contain a minimal desktop environment suitable for experienced user to craft their own setup.

To post a comment you must log in.

Unmerged revisions

1562. By Martin Wimpress 

Added ubuntu-mate-base.

1561. By Sean Davis

Replace Xubuntu Core with Base

1560. By Sean Davis

Merge in lp:~unit193/ubuntu-cdimage/xubuntu-core

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/daily-checks'
2--- bin/daily-checks 2015-10-26 11:06:11 +0000
3+++ bin/daily-checks 2016-01-29 11:35:53 +0000
4@@ -128,7 +128,7 @@
5 warn(project, image, "%s oversized by %d bytes (%d)" %
6 (iso, size - sizelimit, size))
7
8- if project == 'xubuntu':
9+ if project in ('xubuntu', 'xubuntu-base'):
10 for manifest in filter(
11 lambda x: x.endswith('.list') or x.endswith('.manifest'),
12 files):
13@@ -240,6 +240,7 @@
14 'kubuntu',
15 'edubuntu',
16 'xubuntu',
17+ 'xubuntu-base',
18 'ubuntustudio',
19 'ubuntu-netbook',
20 'kubuntu-netbook',
21@@ -250,6 +251,7 @@
22 'lubuntu',
23 'ubuntu-gnome',
24 'ubuntu-mate',
25+ 'ubuntu-mate-base',
26 'ubuntukylin',
27 )
28 if not options.series:
29
30=== modified file 'etc/config'
31--- etc/config 2015-11-11 20:07:52 +0000
32+++ etc/config 2016-01-29 11:35:53 +0000
33@@ -45,7 +45,7 @@
34 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin}"
35 ;;
36 *)
37- ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate ubuntu-desktop-next}"
38+ ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu xubuntu-base ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate ubuntu-mate-base ubuntu-desktop-next}"
39 ;;
40 esac
41
42
43=== modified file 'etc/crontab'
44--- etc/crontab 2016-01-08 13:36:12 +0000
45+++ etc/crontab 2016-01-29 11:35:53 +0000
46@@ -23,6 +23,7 @@
47 14 5 * * * for-project kubuntu cron.daily-live --live
48 24 0 * * * for-project edubuntu cron.dvd --live
49 50 9 * * * for-project xubuntu cron.daily-live --live
50+50 10 * * * for-project xubuntu-base cron.daily-live --live
51 29 6 * * * for-project ubuntu-server cron.daily --live
52 17 18 * * * for-project ubuntustudio cron.dvd --live
53 # mythbuntu will only release for LTS releases, but we keep daily builds around to ensure it remains working
54@@ -35,6 +36,7 @@
55 14 22 * * * for-project ubuntukylin cron.daily-live --live
56 32 15 * * * for-project ubuntu-gnome cron.daily-live --live
57 46 2 * * * for-project ubuntu-mate cron.daily-live --live
58+46 3 * * * for-project ubuntu-mate-base cron.daily-live --live
59
60 # XXX: Note that the EXTRA_PPAS bit here also needs to be mirrored in rebuild-requests:
61 03 2 * * 2-6 DIST=vivid EXTRA_PPAS=ci-train-ppa-service/stable-phone-overlay:1001 for-project ubuntu-touch cron.daily-preinstalled --live
62
63=== modified file 'etc/default-arches'
64--- etc/default-arches 2015-12-08 13:17:26 +0000
65+++ etc/default-arches 2016-01-29 11:35:53 +0000
66@@ -63,6 +63,7 @@
67 ubuntu-gnome * * amd64 i386
68
69 ubuntu-mate * * amd64 i386 powerpc
70+ubuntu-mate-base * * amd64 i386 powerpc
71
72 ubuntu-mid * * lpia
73
74@@ -97,6 +98,8 @@
75 xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps3
76 xubuntu * natty- amd64 i386
77
78+xubuntu-base * * amd64 i386
79+
80 * daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc
81 * daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc
82 * daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc
83
84=== modified file 'etc/qa-products'
85--- etc/qa-products 2015-12-08 13:17:26 +0000
86+++ etc/qa-products 2016-01-29 11:35:53 +0000
87@@ -58,10 +58,13 @@
88 Ubuntu GNOME Desktop amd64 ubuntu-gnome daily-live desktop amd64 iso
89 Ubuntu GNOME Desktop i386 ubuntu-gnome daily-live desktop i386 iso
90
91-# Ubuntu Mate
92-Ubuntu Mate Desktop amd64 ubuntu-mate daily-live desktop amd64 iso
93-Ubuntu Mate Desktop i386 ubuntu-mate daily-live desktop i386 iso
94-Ubuntu Mate Desktop powerpc ubuntu-mate daily-live desktop powerpc iso
95+# Ubuntu MATE
96+Ubuntu MATE Desktop amd64 ubuntu-mate daily-live desktop amd64 iso
97+Ubuntu MATE Desktop i386 ubuntu-mate daily-live desktop i386 iso
98+Ubuntu MATE Desktop powerpc ubuntu-mate daily-live desktop powerpc iso
99+Ubuntu MATE Base amd64 ubuntu-mate-base daily-live base amd64 iso
100+Ubuntu MATE Base i386 ubuntu-mate-base daily-live base i386 iso
101+Ubuntu MATE Base powerpc ubuntu-mate-base daily-live base powerpc iso
102
103 # Ubuntu Server
104 Ubuntu Server amd64 ubuntu-server daily server amd64 iso
105@@ -90,5 +93,7 @@
106 Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso
107
108 # Xubuntu
109+Xubuntu Base amd64 xubuntu-base daily-live base amd64 iso
110+Xubuntu Base i386 xubuntu-base daily-live base i386 iso
111 Xubuntu Desktop amd64 xubuntu daily-live desktop amd64 iso
112 Xubuntu Desktop i386 xubuntu daily-live desktop i386 iso
113
114=== modified file 'lib/cdimage/build.py'
115--- lib/cdimage/build.py 2015-12-09 12:31:46 +0000
116+++ lib/cdimage/build.py 2016-01-29 11:35:53 +0000
117@@ -97,8 +97,10 @@
118 "ubuntukylin",
119 "ubuntu-gnome",
120 "ubuntu-mate",
121+ "ubuntu-mate-base",
122 "ubuntu-moblin-remix",
123 "ubuntu-mid",
124+ "xubuntu-base",
125 ):
126 config["CDIMAGE_UNSUPPORTED"] = "1"
127
128
129=== modified file 'lib/cdimage/germinate.py'
130--- lib/cdimage/germinate.py 2015-10-26 11:06:11 +0000
131+++ lib/cdimage/germinate.py 2016-01-29 11:35:53 +0000
132@@ -78,14 +78,14 @@
133 sources.insert(0, pattern % "ubuntustudio-dev")
134 elif project == "mythbuntu":
135 sources.insert(0, pattern % "mythbuntu-dev")
136- elif project == "xubuntu":
137+ elif project in ("xubuntu", "xubuntu-base"):
138 if series >= "intrepid":
139 sources.insert(0, pattern % "xubuntu-dev")
140 elif project == "lubuntu":
141 sources.insert(0, pattern % "lubuntu-dev")
142 elif project == "ubuntu-gnome":
143 sources.insert(0, pattern % "ubuntu-gnome-dev")
144- elif project == "ubuntu-mate":
145+ elif project in ("ubuntu-mate", "ubuntu-mate-base"):
146 sources.insert(0, pattern % "ubuntu-mate-dev")
147 elif project == "ubuntu-moblin-remix":
148 sources.insert(0, pattern % "moblin")
149
150=== modified file 'lib/cdimage/project.py'
151--- lib/cdimage/project.py 2015-09-21 11:04:35 +0000
152+++ lib/cdimage/project.py 2016-01-29 11:35:53 +0000
153@@ -36,6 +36,7 @@
154 "kubuntu-plasma5": "Kubuntu-Plasma-5",
155 "edubuntu": "Edubuntu",
156 "xubuntu": "Xubuntu",
157+ "xubuntu-base": "Xubuntu-Base",
158 "gobuntu": "Gobuntu",
159 "ubuntu-server": "Ubuntu-Server",
160 "jeos": "Ubuntu-JeOS",
161@@ -48,6 +49,7 @@
162 "ubuntukylin": "Ubuntu-Kylin",
163 "ubuntu-gnome": "Ubuntu-GNOME",
164 "ubuntu-mate": "Ubuntu-MATE",
165+ "ubuntu-mate-base": "Ubuntu-MATE-Base",
166 "ubuntu-moblin-remix": "Ubuntu-Moblin-Remix",
167 "livecd-base": "LiveCD-Base",
168 "ubuntu-core": "Ubuntu-Core",
169
170=== modified file 'lib/cdimage/tests/test_build.py'
171--- lib/cdimage/tests/test_build.py 2015-12-09 12:31:46 +0000
172+++ lib/cdimage/tests/test_build.py 2016-01-29 11:35:53 +0000
173@@ -536,6 +536,7 @@
174 ("edubuntu", "karmic", False, True),
175 ("xubuntu", "gutsy", False, False),
176 ("xubuntu", "hardy", False, True),
177+ ("xubuntu-base", "wily", False, True),
178 ("kubuntu", "precise", False, False),
179 ("kubuntu", "quantal", False, True),
180 ("kubuntu-active", "raring", False, True),
181@@ -546,6 +547,7 @@
182 ("ubuntukylin", "raring", False, True),
183 ("ubuntu-gnome", "raring", False, True),
184 ("ubuntu-mate", "vivid", False, True),
185+ ("ubuntu-mate-base", "xenial", False, True),
186 ("ubuntu-moblin-remix", "raring", False, True),
187 ("ubuntu-desktop-next", "utopic", False, False),
188 ):
189
190=== modified file 'lib/cdimage/tests/test_germinate.py'
191--- lib/cdimage/tests/test_germinate.py 2015-10-26 11:06:11 +0000
192+++ lib/cdimage/tests/test_germinate.py 2016-01-29 11:35:53 +0000
193@@ -93,11 +93,14 @@
194 ("mythbuntu", "raring", ["mythbuntu-dev", "ubuntu-core-dev"]),
195 ("xubuntu", "hardy", ["ubuntu-core-dev"]),
196 ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
197+ ("xubuntu-base", "wily", ["xubuntu-dev", "ubuntu-core-dev"]),
198 ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
199 ("ubuntu-gnome", "raring",
200 ["ubuntu-gnome-dev", "ubuntu-core-dev"]),
201 ("ubuntu-mate", "vivid",
202 ["ubuntu-mate-dev", "ubuntu-core-dev"]),
203+ ("ubuntu-mate-base", "xenial",
204+ ["ubuntu-mate-dev", "ubuntu-core-dev"]),
205 ("ubuntu-moblin-remix", "hardy", ["moblin", "ubuntu-core-dev"]),
206 ("ubuntukylin", "trusty", ["ubuntu-core-dev"]),
207 ("ubuntukylin", "utopic",
208
209=== modified file 'lib/cdimage/tests/test_tree.py'
210--- lib/cdimage/tests/test_tree.py 2015-12-08 13:17:26 +0000
211+++ lib/cdimage/tests/test_tree.py 2016-01-29 11:35:53 +0000
212@@ -714,8 +714,10 @@
213 ("ubuntu", "trusty", "daily-live", "powerpc", 1073741824),
214 ("xubuntu", "quantal", "daily-live", "i386", 736665600),
215 ("xubuntu", "raring", "daily-live", "i386", 1073741824),
216+ ("xubuntu-base", None, "daily-live", "i386", 736665600),
217 ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
218 ("ubuntu-mate", None, "daily-live", "amd64", 1073741824),
219+ ("ubuntu-mate-base", None, "daily-live", "amd64", 736665600),
220 ):
221 if dist is not None:
222 self.config["DIST"] = dist
223@@ -1198,6 +1200,7 @@
224 "Kubuntu Plasma 5 Desktop"),
225 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
226 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
227+ ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
228 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
229 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
230 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
231@@ -1206,7 +1209,8 @@
232 ("ubuntu-core", "daily", "core", "Ubuntu Core"),
233 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
234 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
235- ("ubuntu-mate", "daily-live", "desktop", "Ubuntu Mate Desktop"),
236+ ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
237+ ("ubuntu-mate-base", "daily-live", "base", "Ubuntu MATE Base"),
238 ("ubuntu-desktop-next", "daily-preinstalled",
239 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
240 ):
241@@ -1259,6 +1263,7 @@
242 "Kubuntu Plasma 5 Desktop"),
243 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
244 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
245+ ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
246 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
247 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
248 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
249@@ -1267,7 +1272,8 @@
250 ("ubuntu-core", "daily", "core", "Ubuntu Core"),
251 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
252 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
253- ("ubuntu-mate", "daily-live", "desktop", "Ubuntu Mate Desktop"),
254+ ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
255+ ("ubuntu-mate-base", "daily-live", "base", "Ubuntu MATE Base"),
256 ("ubuntu-desktop-next/system-image", "daily-preinstalled",
257 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
258 ):
259
260=== modified file 'lib/cdimage/tree.py'
261--- lib/cdimage/tree.py 2015-12-08 13:17:26 +0000
262+++ lib/cdimage/tree.py 2016-01-29 11:35:53 +0000
263@@ -70,12 +70,14 @@
264 "ubuntu-desktop-next",
265 "ubuntu-gnome",
266 "ubuntu-mate",
267+ "ubuntu-mate-base",
268 "ubuntu-headless",
269 "ubuntu-netbook",
270 "ubuntu-server",
271 "ubuntukylin",
272 "ubuntustudio",
273 "xubuntu",
274+ "xubuntu-base",
275 ]
276
277
278@@ -155,6 +157,10 @@
279 """Return the per-project base directory within this tree."""
280 if self.config.project == "ubuntu":
281 return self.directory
282+ elif self.config.project == "xubuntu-base":
283+ return os.path.join(self.directory, "xubuntu")
284+ elif self.config.project == "ubuntu-mate-base":
285+ return os.path.join(self.directory, "ubuntu-mate")
286 else:
287 return os.path.join(self.directory, self.config.project)
288
289@@ -400,6 +406,9 @@
290 return "netbook"
291 elif self.project == "ubuntu-server":
292 return "live"
293+ elif self.project == "xubuntu-base" or \
294+ self.project == "ubuntu-mate-base":
295+ return "base"
296 else:
297 if self.config["DIST"] <= "breezy":
298 return "live"
299@@ -432,12 +441,15 @@
300
301 # Keep this in sync with publish_type above.
302 @staticmethod
303- def _guess_image_type(publish_type):
304+ def _guess_image_type(self, publish_type):
305 if publish_type.startswith("preinstalled-"):
306 return "daily-preinstalled"
307 elif publish_type in (
308 "desktop", "live", "mid", "moblin-remix", "netbook"):
309 return "daily-live"
310+ elif publish_type == "base" and \
311+ (self.project == "xubuntu-base" or self.project == "ubuntu-mate-base"):
312+ return "daily-live"
313 elif publish_type == "dvd":
314 return "dvd"
315 elif publish_type in (
316@@ -490,6 +502,8 @@
317 return "live %s" % cd
318 elif publish_type == "desktop":
319 return "desktop %s" % cd
320+ elif publish_type == "base":
321+ return "base %s" % cd
322 elif publish_type == "install":
323 return "install %s" % cd
324 elif publish_type == "alternate":
325@@ -547,7 +561,7 @@
326 if self.project == "mid":
327 # MID has lower memory requirements than others
328 desktop_ram = 128
329- if self.project == "xubuntu":
330+ if self.project in ("xubuntu", "xubuntu-base"):
331 if series <= "intrepid":
332 desktop_ram = 128
333 else:
334@@ -609,6 +623,12 @@
335 sentences.append(
336 "You can install additional educational programs using "
337 "the classroom server add-on %s." % cd)
338+ elif publish_type == "base" and \
339+ (self.project == "xubuntu-base" or self.project == "ubuntu-mate-base"):
340+ sentences.append(
341+ "The base %s allows you to try %s without changing your "
342+ "computer at all, and at your option to install it "
343+ "permanently later." % (cd, capproject))
344 elif publish_type == "install":
345 sentences.append(
346 "The install %s allows you to install %s permanently on a "
347@@ -1107,6 +1127,7 @@
348
349 all_publish_types = (
350 "live", "desktop",
351+ "base",
352 "server", "install", "alternate",
353 "serveraddon", "addon",
354 "dvd",

Subscribers

People subscribed via source and target branches