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

Proposed by Sean Davis on 2018-06-02
Status: Needs review
Proposed branch: lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base
Merge into: lp:ubuntu-cdimage
Diff against target: 263 lines (+36/-7)
12 files modified
bin/daily-checks (+2/-1)
etc/config (+1/-1)
etc/crontab (+1/-0)
etc/default-arches (+2/-0)
etc/qa-products (+2/-0)
lib/cdimage/build.py (+1/-0)
lib/cdimage/germinate.py (+1/-1)
lib/cdimage/project.py (+1/-0)
lib/cdimage/tests/test_build.py (+1/-0)
lib/cdimage/tests/test_germinate.py (+1/-0)
lib/cdimage/tests/test_tree.py (+5/-1)
lib/cdimage/tree.py (+18/-3)
To merge this branch: bzr merge lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base
Reviewer Review Type Date Requested Status
Adam Conrad 2018-07-02 Pending
Ubuntu CD Image Team 2018-06-02 Pending
Review via email: mp+347320@code.launchpad.net

Commit message

Add xubuntu-base to ubuntu-cdimage

Description of the change

This series of patches adds Xubuntu Base to the official Ubuntu CD Image download links. Xubuntu Base is supported by the Xubuntu Team and is the ISO image for the xubuntu-core task which has been around for a few releases now.

There has been some conflict with the previous naming of Xubuntu Base/Core because of it's similarity to Ubuntu Core. Regardless, you can learn more about it here: https://xubuntu.org/news/introducing-xubuntu-core/

Related branches:
- https://code.launchpad.net/~xubuntu-dev/debian-cd/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/xubuntu-base

To post a comment you must log in.

Unmerged revisions

1563. By Sean Davis on 2018-06-02

Merge lp:ubuntu-cdimage revno 1736, add optional project param to _guess_image_type to disambiguate

1562. By Sean Davis on 2018-03-28

Merge lp:ubuntu-cdimage rev 1715

1561. By Sean Davis on 2016-01-26

Replace Xubuntu Core with Base

1560. By Sean Davis on 2016-01-26

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 2018-05-02 22:06:50 +0000
3+++ bin/daily-checks 2018-06-02 01:10:16 +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@@ -242,6 +242,7 @@
14 'kubuntu',
15 'edubuntu',
16 'xubuntu',
17+ 'xubuntu-base',
18 'ubuntustudio',
19 'ubuntu-netbook',
20 'kubuntu-netbook',
21
22=== modified file 'etc/config'
23--- etc/config 2018-05-11 18:15:52 +0000
24+++ etc/config 2018-06-02 01:10:16 +0000
25@@ -53,7 +53,7 @@
26 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate}"
27 ;;
28 *)
29- ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
30+ ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu xubuntu-base ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
31 ;;
32 esac
33
34
35=== modified file 'etc/crontab'
36--- etc/crontab 2018-05-04 04:02:06 +0000
37+++ etc/crontab 2018-06-02 01:10:16 +0000
38@@ -33,6 +33,7 @@
39 30 8 * * * for-project ubuntu-core cron.daily-live --live
40 14 5 * * * for-project kubuntu cron.daily-live --live
41 50 1 * * * for-project xubuntu cron.daily-live --live
42+50 2 * * * for-project xubuntu-base cron.daily-live --live
43 29 6 * * * for-project ubuntu-server cron.daily --live; for-project ubuntu-server cron.daily-preinstalled --live; SUBPROJECT=live for-project ubuntu-server cron.daily-live --live
44 17 18 * * * for-project ubuntustudio cron.dvd --live
45 29 16 * * * for-project lubuntu cron.daily-live --live
46
47=== modified file 'etc/default-arches'
48--- etc/default-arches 2018-05-22 18:23:25 +0000
49+++ etc/default-arches 2018-06-02 01:10:16 +0000
50@@ -114,6 +114,8 @@
51 xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps3
52 xubuntu * natty- amd64 i386
53
54+xubuntu-base * * amd64 i386
55+
56 * daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc
57 * daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc
58 * daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc
59
60=== modified file 'etc/qa-products'
61--- etc/qa-products 2017-10-19 09:55:35 +0000
62+++ etc/qa-products 2018-06-02 01:10:16 +0000
63@@ -103,5 +103,7 @@
64 Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso
65
66 # Xubuntu
67+Xubuntu Base amd64 xubuntu-base daily-live base amd64 iso
68+Xubuntu Base i386 xubuntu-base daily-live base i386 iso
69 Xubuntu Desktop amd64 xubuntu daily-live desktop amd64 iso
70 Xubuntu Desktop i386 xubuntu daily-live desktop i386 iso
71
72=== modified file 'lib/cdimage/build.py'
73--- lib/cdimage/build.py 2018-01-09 01:47:28 +0000
74+++ lib/cdimage/build.py 2018-06-02 01:10:16 +0000
75@@ -100,6 +100,7 @@
76 "ubuntu-mate",
77 "ubuntu-moblin-remix",
78 "ubuntu-mid",
79+ "xubuntu-base",
80 ):
81 config["CDIMAGE_UNSUPPORTED"] = "1"
82
83
84=== modified file 'lib/cdimage/germinate.py'
85--- lib/cdimage/germinate.py 2018-05-29 03:36:12 +0000
86+++ lib/cdimage/germinate.py 2018-06-02 01:10:16 +0000
87@@ -81,7 +81,7 @@
88 sources.insert(0, bzrpattern % "ubuntustudio-dev")
89 elif project == "mythbuntu":
90 sources.insert(0, bzrpattern % "mythbuntu-dev")
91- elif project == "xubuntu":
92+ elif project in ("xubuntu", "xubuntu-base"):
93 if series >= "intrepid":
94 sources.insert(0, gitpattern % "xubuntu-dev")
95 else:
96
97=== modified file 'lib/cdimage/project.py'
98--- lib/cdimage/project.py 2017-05-01 02:22:20 +0000
99+++ lib/cdimage/project.py 2018-06-02 01:10:16 +0000
100@@ -36,6 +36,7 @@
101 "kubuntu-plasma5": "Kubuntu-Plasma-5",
102 "edubuntu": "Edubuntu",
103 "xubuntu": "Xubuntu",
104+ "xubuntu-base": "Xubuntu-Base",
105 "gobuntu": "Gobuntu",
106 "ubuntu-server": "Ubuntu-Server",
107 "jeos": "Ubuntu-JeOS",
108
109=== modified file 'lib/cdimage/tests/test_build.py'
110--- lib/cdimage/tests/test_build.py 2018-01-09 01:47:28 +0000
111+++ lib/cdimage/tests/test_build.py 2018-06-02 01:10:16 +0000
112@@ -560,6 +560,7 @@
113 ("edubuntu", "karmic", False, True),
114 ("xubuntu", "gutsy", False, False),
115 ("xubuntu", "hardy", False, True),
116+ ("xubuntu-base", "wily", False, True),
117 ("kubuntu", "precise", False, False),
118 ("kubuntu", "quantal", False, True),
119 ("kubuntu-active", "raring", False, True),
120
121=== modified file 'lib/cdimage/tests/test_germinate.py'
122--- lib/cdimage/tests/test_germinate.py 2018-05-29 03:40:05 +0000
123+++ lib/cdimage/tests/test_germinate.py 2018-06-02 01:10:16 +0000
124@@ -113,6 +113,7 @@
125 ("ubuntu", "raring", ["ubuntu-core-dev"]),
126 ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
127 ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
128+ ("xubuntu-base", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
129 ("ubuntukylin", "utopic", ["ubuntukylin-members", "ubuntu-core-dev"]),
130 ):
131 self.config["DIST"] = series
132
133=== modified file 'lib/cdimage/tests/test_tree.py'
134--- lib/cdimage/tests/test_tree.py 2018-05-02 22:06:50 +0000
135+++ lib/cdimage/tests/test_tree.py 2018-06-02 01:10:16 +0000
136@@ -293,7 +293,8 @@
137 self.assertEqual(publish_type, publisher.publish_type)
138 if "_" not in image_type:
139 self.assertEqual(
140- image_type, Publisher._guess_image_type(publish_type))
141+ image_type, Publisher._guess_image_type(publish_type,
142+ project))
143
144
145 class TestPublisherWebIndices(TestCase):
146@@ -750,6 +751,7 @@
147 ("xubuntu", "quantal", "daily-live", "i386", 736665600),
148 ("xubuntu", "raring", "daily-live", "i386", 1073741824),
149 ("xubuntu", "xenial", "daily-live", "i386", 1460000000),
150+ ("xubuntu-base", "bionic", "daily-live", "i386", 736665600),
151 ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
152 ("ubuntu-gnome", "xenial", "daily-live", "i386", 2000000000),
153 ("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000),
154@@ -1286,6 +1288,7 @@
155 "Kubuntu Plasma 5 Desktop"),
156 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
157 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
158+ ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
159 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
160 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
161 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
162@@ -1359,6 +1362,7 @@
163 "Kubuntu Plasma 5 Desktop"),
164 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
165 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
166+ ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
167 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
168 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
169 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
170
171=== modified file 'lib/cdimage/tree.py'
172--- lib/cdimage/tree.py 2018-04-26 23:41:37 +0000
173+++ lib/cdimage/tree.py 2018-06-02 01:10:16 +0000
174@@ -82,6 +82,7 @@
175 "ubuntukylin",
176 "ubuntustudio",
177 "xubuntu",
178+ "xubuntu-base",
179 ]
180
181
182@@ -161,6 +162,8 @@
183 """Return the per-project base directory within this tree."""
184 if self.config.project == "ubuntu":
185 return self.directory
186+ elif self.config.project == "xubuntu-base":
187+ return os.path.join(self.directory, "xubuntu")
188 else:
189 return os.path.join(self.directory, self.config.project)
190
191@@ -253,7 +256,7 @@
192 config["IMAGE_TYPE"] = options.image_type
193 elif options.publish_type:
194 config["IMAGE_TYPE"] = DailyTreePublisher._guess_image_type(
195- options.publish_type)
196+ options.publish_type, options.project)
197 if not config["IMAGE_TYPE"]:
198 parser.error(
199 "unrecognised publish type '%s'" % options.publish_type)
200@@ -406,6 +409,8 @@
201 return "live-server"
202 elif self.project == "ubuntu-core":
203 return "live-core"
204+ elif self.project == "xubuntu-base":
205+ return "base"
206 else:
207 if self.config["DIST"] <= "breezy":
208 return "live"
209@@ -438,13 +443,15 @@
210
211 # Keep this in sync with publish_type above.
212 @staticmethod
213- def _guess_image_type(publish_type):
214+ def _guess_image_type(publish_type, project = None):
215 if publish_type.startswith("preinstalled-"):
216 return "daily-preinstalled"
217 elif publish_type in (
218 "desktop", "live", "mid", "moblin-remix", "netbook",
219 "live-core", "live-server"):
220 return "daily-live"
221+ elif publish_type == "base" and project == "xubuntu-base":
222+ return "daily-live"
223 elif publish_type == "dvd":
224 return "dvd"
225 elif publish_type in (
226@@ -501,6 +508,8 @@
227 return "Ubuntu Core %s" % cd
228 elif publish_type == "desktop":
229 return "desktop %s" % cd
230+ elif publish_type == "base":
231+ return "base %s" % cd
232 elif publish_type == "install":
233 return "install %s" % cd
234 elif publish_type == "alternate":
235@@ -558,7 +567,7 @@
236 if self.project == "mid":
237 # MID has lower memory requirements than others
238 desktop_ram = 128
239- if self.project == "xubuntu":
240+ if self.project in ("xubuntu", "xubuntu-base"):
241 if series <= "intrepid":
242 desktop_ram = 128
243 else:
244@@ -622,6 +631,11 @@
245 sentences.append(
246 "You can install additional educational programs using "
247 "the classroom server add-on %s." % cd)
248+ elif publish_type == "base" and self.project == "xubuntu-base":
249+ sentences.append(
250+ "The base %s allows you to try %s without changing your "
251+ "computer at all, and at your option to install it "
252+ "permanently later." % (cd, capproject))
253 elif publish_type == "install":
254 sentences.append(
255 "The install %s allows you to install %s permanently on a "
256@@ -1136,6 +1150,7 @@
257
258 all_publish_types = (
259 "live", "desktop",
260+ "base",
261 "live-server",
262 "server", "install", "alternate",
263 "serveraddon", "addon",

Subscribers

People subscribed via source and target branches