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

[Martin Wimpress ]

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.

[Steve Langasek (vorlon)]

This MP is no longer mergeable due to code drift (changes in supported/supportable architectures; changes to targeted series). It was also apparently submitted based on discussions with Adam; it is no longer possible to consult him regarding intent.

And we are moving the ubuntu-cdimage code to git, which means this would need to be rebased and resubmitted regardless.

If this is still relevant and you still want it landed (...after 6 years), please discuss with the current members of the Release Team about the plan prior to resubmitting.

review: Needs Resubmitting

Unmerged revisions

1562. By Martin Wimpress  on 2016-01-26

Added ubuntu-mate-base.

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

=== modified file 'bin/daily-checks'
--- bin/daily-checks	2015-10-26 11:06:11 +0000
+++ bin/daily-checks	2016-01-29 11:35:53 +0000
@@ -128,7 +128,7 @@
             warn(project, image, "%s oversized by %d bytes (%d)" %
                                  (iso, size - sizelimit, size))
 
-    if project == 'xubuntu':
+    if project in ('xubuntu', 'xubuntu-base'):
         for manifest in filter(
                 lambda x: x.endswith('.list') or x.endswith('.manifest'),
                 files):
@@ -240,6 +240,7 @@
         'kubuntu',
         'edubuntu',
         'xubuntu',
+        'xubuntu-base',
         'ubuntustudio',
         'ubuntu-netbook',
         'kubuntu-netbook',
@@ -250,6 +251,7 @@
         'lubuntu',
         'ubuntu-gnome',
         'ubuntu-mate',
+        'ubuntu-mate-base',
         'ubuntukylin',
         )
     if not options.series:
 
=== modified file 'etc/config'
--- etc/config	2015-11-11 20:07:52 +0000
+++ etc/config	2016-01-29 11:35:53 +0000
@@ -45,7 +45,7 @@
         ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin}"
         ;;
     *)
-        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate ubuntu-desktop-next}"
+        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu xubuntu-base ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate ubuntu-mate-base ubuntu-desktop-next}"
         ;;
 esac
 
 
=== modified file 'etc/crontab'
--- etc/crontab	2016-01-08 13:36:12 +0000
+++ etc/crontab	2016-01-29 11:35:53 +0000
@@ -23,6 +23,7 @@
 14 5 * * *	for-project kubuntu cron.daily-live --live
 24 0 * * *	for-project edubuntu cron.dvd --live
 50 9 * * *	for-project xubuntu cron.daily-live --live
+50 10 * * *	for-project xubuntu-base cron.daily-live --live
 29 6 * * *	for-project ubuntu-server cron.daily --live
 17 18 * * *	for-project ubuntustudio cron.dvd --live
 # mythbuntu will only release for LTS releases, but we keep daily builds around to ensure it remains working
@@ -35,6 +36,7 @@
 14 22 * * *	for-project ubuntukylin cron.daily-live --live
 32 15 * * *	for-project ubuntu-gnome cron.daily-live --live
 46 2 * * *	for-project ubuntu-mate cron.daily-live --live
+46 3 * * *	for-project ubuntu-mate-base cron.daily-live --live
 
 # XXX: Note that the EXTRA_PPAS bit here also needs to be mirrored in rebuild-requests:
 03 2 * * 2-6	DIST=vivid EXTRA_PPAS=ci-train-ppa-service/stable-phone-overlay:1001 for-project ubuntu-touch cron.daily-preinstalled --live
 
=== modified file 'etc/default-arches'
--- etc/default-arches	2015-12-08 13:17:26 +0000
+++ etc/default-arches	2016-01-29 11:35:53 +0000
@@ -63,6 +63,7 @@
 ubuntu-gnome		*			*			amd64 i386
 
 ubuntu-mate		*			*			amd64 i386 powerpc
+ubuntu-mate-base		*			*			amd64 i386 powerpc
 
 ubuntu-mid		*			*			lpia
 
@@ -97,6 +98,8 @@
 xubuntu			*			feisty-maverick		amd64 i386 powerpc powerpc+ps3
 xubuntu			*			natty-			amd64 i386
 
+xubuntu-base		*			*			amd64 i386
+
 *			daily-live		gutsy-intrepid		amd64 i386 ia64 powerpc powerpc+ps3 sparc
 *			daily-live		jaunty			amd64 armel i386 ia64 powerpc powerpc+ps3 sparc
 *			daily-live		karmic			amd64 i386 ia64 powerpc powerpc+ps3 sparc
 
=== modified file 'etc/qa-products'
--- etc/qa-products	2015-12-08 13:17:26 +0000
+++ etc/qa-products	2016-01-29 11:35:53 +0000
@@ -58,10 +58,13 @@
 Ubuntu GNOME Desktop amd64					ubuntu-gnome	daily-live			desktop					amd64			iso
 Ubuntu GNOME Desktop i386					ubuntu-gnome	daily-live			desktop					i386			iso
 
-# Ubuntu Mate
-Ubuntu Mate Desktop amd64					ubuntu-mate	daily-live			desktop					amd64			iso
-Ubuntu Mate Desktop i386					ubuntu-mate	daily-live			desktop					i386			iso
-Ubuntu Mate Desktop powerpc					ubuntu-mate	daily-live			desktop					powerpc			iso
+# Ubuntu MATE
+Ubuntu MATE Desktop amd64					ubuntu-mate	daily-live			desktop					amd64			iso
+Ubuntu MATE Desktop i386					ubuntu-mate	daily-live			desktop					i386			iso
+Ubuntu MATE Desktop powerpc					ubuntu-mate	daily-live			desktop					powerpc			iso
+Ubuntu MATE Base amd64					ubuntu-mate-base	daily-live			base					amd64			iso
+Ubuntu MATE Base i386					ubuntu-mate-base	daily-live			base					i386			iso
+Ubuntu MATE Base powerpc					ubuntu-mate-base	daily-live			base					powerpc			iso
 
 # Ubuntu Server
 Ubuntu Server amd64							ubuntu-server	daily				server					amd64			iso
@@ -90,5 +93,7 @@
 Ubuntu Kylin Desktop i386					ubuntukylin		daily-live			desktop					i386			iso
 
 # Xubuntu
+Xubuntu Base amd64						xubuntu-base		daily-live			base					amd64			iso
+Xubuntu Base i386						xubuntu-base		daily-live			base					i386			iso
 Xubuntu Desktop amd64						xubuntu			daily-live			desktop					amd64			iso
 Xubuntu Desktop i386						xubuntu			daily-live			desktop					i386			iso
 
=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py	2015-12-09 12:31:46 +0000
+++ lib/cdimage/build.py	2016-01-29 11:35:53 +0000
@@ -97,8 +97,10 @@
         "ubuntukylin",
         "ubuntu-gnome",
         "ubuntu-mate",
+        "ubuntu-mate-base",
         "ubuntu-moblin-remix",
         "ubuntu-mid",
+        "xubuntu-base",
     ):
         config["CDIMAGE_UNSUPPORTED"] = "1"
 
 
=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py	2015-10-26 11:06:11 +0000
+++ lib/cdimage/germinate.py	2016-01-29 11:35:53 +0000
@@ -78,14 +78,14 @@
                 sources.insert(0, pattern % "ubuntustudio-dev")
             elif project == "mythbuntu":
                 sources.insert(0, pattern % "mythbuntu-dev")
-            elif project == "xubuntu":
+            elif project in ("xubuntu", "xubuntu-base"):
                 if series >= "intrepid":
                     sources.insert(0, pattern % "xubuntu-dev")
             elif project == "lubuntu":
                 sources.insert(0, pattern % "lubuntu-dev")
             elif project == "ubuntu-gnome":
                 sources.insert(0, pattern % "ubuntu-gnome-dev")
-            elif project == "ubuntu-mate":
+            elif project in ("ubuntu-mate", "ubuntu-mate-base"):
                 sources.insert(0, pattern % "ubuntu-mate-dev")
             elif project == "ubuntu-moblin-remix":
                 sources.insert(0, pattern % "moblin")
 
=== modified file 'lib/cdimage/project.py'
--- lib/cdimage/project.py	2015-09-21 11:04:35 +0000
+++ lib/cdimage/project.py	2016-01-29 11:35:53 +0000
@@ -36,6 +36,7 @@
     "kubuntu-plasma5": "Kubuntu-Plasma-5",
     "edubuntu": "Edubuntu",
     "xubuntu": "Xubuntu",
+    "xubuntu-base": "Xubuntu-Base",
     "gobuntu": "Gobuntu",
     "ubuntu-server": "Ubuntu-Server",
     "jeos": "Ubuntu-JeOS",
@@ -48,6 +49,7 @@
     "ubuntukylin": "Ubuntu-Kylin",
     "ubuntu-gnome": "Ubuntu-GNOME",
     "ubuntu-mate": "Ubuntu-MATE",
+    "ubuntu-mate-base": "Ubuntu-MATE-Base",
     "ubuntu-moblin-remix": "Ubuntu-Moblin-Remix",
     "livecd-base": "LiveCD-Base",
     "ubuntu-core": "Ubuntu-Core",
 
=== modified file 'lib/cdimage/tests/test_build.py'
--- lib/cdimage/tests/test_build.py	2015-12-09 12:31:46 +0000
+++ lib/cdimage/tests/test_build.py	2016-01-29 11:35:53 +0000
@@ -536,6 +536,7 @@
             ("edubuntu", "karmic", False, True),
             ("xubuntu", "gutsy", False, False),
             ("xubuntu", "hardy", False, True),
+            ("xubuntu-base", "wily", False, True),
             ("kubuntu", "precise", False, False),
             ("kubuntu", "quantal", False, True),
             ("kubuntu-active", "raring", False, True),
@@ -546,6 +547,7 @@
             ("ubuntukylin", "raring", False, True),
             ("ubuntu-gnome", "raring", False, True),
             ("ubuntu-mate", "vivid", False, True),
+            ("ubuntu-mate-base", "xenial", False, True),
             ("ubuntu-moblin-remix", "raring", False, True),
             ("ubuntu-desktop-next", "utopic", False, False),
         ):
 
=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py	2015-10-26 11:06:11 +0000
+++ lib/cdimage/tests/test_germinate.py	2016-01-29 11:35:53 +0000
@@ -93,11 +93,14 @@
             ("mythbuntu", "raring", ["mythbuntu-dev", "ubuntu-core-dev"]),
             ("xubuntu", "hardy", ["ubuntu-core-dev"]),
             ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
+            ("xubuntu-base", "wily", ["xubuntu-dev", "ubuntu-core-dev"]),
             ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
             ("ubuntu-gnome", "raring",
              ["ubuntu-gnome-dev", "ubuntu-core-dev"]),
             ("ubuntu-mate", "vivid",
              ["ubuntu-mate-dev", "ubuntu-core-dev"]),
+            ("ubuntu-mate-base", "xenial",
+             ["ubuntu-mate-dev", "ubuntu-core-dev"]),
             ("ubuntu-moblin-remix", "hardy", ["moblin", "ubuntu-core-dev"]),
             ("ubuntukylin", "trusty", ["ubuntu-core-dev"]),
             ("ubuntukylin", "utopic",
 
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2015-12-08 13:17:26 +0000
+++ lib/cdimage/tests/test_tree.py	2016-01-29 11:35:53 +0000
@@ -714,8 +714,10 @@
             ("ubuntu", "trusty", "daily-live", "powerpc", 1073741824),
             ("xubuntu", "quantal", "daily-live", "i386", 736665600),
             ("xubuntu", "raring", "daily-live", "i386", 1073741824),
+            ("xubuntu-base", None, "daily-live", "i386", 736665600),
             ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
             ("ubuntu-mate", None, "daily-live", "amd64", 1073741824),
+            ("ubuntu-mate-base", None, "daily-live", "amd64", 736665600),
         ):
             if dist is not None:
                 self.config["DIST"] = dist
@@ -1198,6 +1200,7 @@
                 "Kubuntu Plasma 5 Desktop"),
             ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
             ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
+            ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
             ("ubuntu-server", "daily", "server", "Ubuntu Server"),
             ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
             ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
@@ -1206,7 +1209,8 @@
             ("ubuntu-core", "daily", "core", "Ubuntu Core"),
             ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
             ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
-            ("ubuntu-mate", "daily-live", "desktop", "Ubuntu Mate Desktop"),
+            ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
+            ("ubuntu-mate-base", "daily-live", "base", "Ubuntu MATE Base"),
             ("ubuntu-desktop-next", "daily-preinstalled",
                 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
         ):
@@ -1259,6 +1263,7 @@
                 "Kubuntu Plasma 5 Desktop"),
             ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
             ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
+            ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
             ("ubuntu-server", "daily", "server", "Ubuntu Server"),
             ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
             ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
@@ -1267,7 +1272,8 @@
             ("ubuntu-core", "daily", "core", "Ubuntu Core"),
             ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
             ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
-            ("ubuntu-mate", "daily-live", "desktop", "Ubuntu Mate Desktop"),
+            ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
+            ("ubuntu-mate-base", "daily-live", "base", "Ubuntu MATE Base"),
             ("ubuntu-desktop-next/system-image", "daily-preinstalled",
                 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
         ):
 
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2015-12-08 13:17:26 +0000
+++ lib/cdimage/tree.py	2016-01-29 11:35:53 +0000
@@ -70,12 +70,14 @@
     "ubuntu-desktop-next",
     "ubuntu-gnome",
     "ubuntu-mate",
+    "ubuntu-mate-base",
     "ubuntu-headless",
     "ubuntu-netbook",
     "ubuntu-server",
     "ubuntukylin",
     "ubuntustudio",
     "xubuntu",
+    "xubuntu-base",
 ]
 
 
@@ -155,6 +157,10 @@
         """Return the per-project base directory within this tree."""
         if self.config.project == "ubuntu":
             return self.directory
+        elif self.config.project == "xubuntu-base":
+            return os.path.join(self.directory, "xubuntu")
+        elif self.config.project == "ubuntu-mate-base":
+            return os.path.join(self.directory, "ubuntu-mate")            
         else:
             return os.path.join(self.directory, self.config.project)
 
@@ -400,6 +406,9 @@
                 return "netbook"
             elif self.project == "ubuntu-server":
                 return "live"
+            elif self.project == "xubuntu-base" or \
+                 self.project == "ubuntu-mate-base":
+                return "base"
             else:
                 if self.config["DIST"] <= "breezy":
                     return "live"
@@ -432,12 +441,15 @@
 
     # Keep this in sync with publish_type above.
     @staticmethod
-    def _guess_image_type(publish_type):
+    def _guess_image_type(self, publish_type):
         if publish_type.startswith("preinstalled-"):
             return "daily-preinstalled"
         elif publish_type in (
                 "desktop", "live", "mid", "moblin-remix", "netbook"):
             return "daily-live"
+	elif publish_type == "base" and \
+		 (self.project == "xubuntu-base" or self.project == "ubuntu-mate-base"):
+            return "daily-live"
         elif publish_type == "dvd":
             return "dvd"
         elif publish_type in (
@@ -490,6 +502,8 @@
             return "live %s" % cd
         elif publish_type == "desktop":
             return "desktop %s" % cd
+        elif publish_type == "base":
+            return "base %s" % cd
         elif publish_type == "install":
             return "install %s" % cd
         elif publish_type == "alternate":
@@ -547,7 +561,7 @@
         if self.project == "mid":
             # MID has lower memory requirements than others
             desktop_ram = 128
-        if self.project == "xubuntu":
+        if self.project in ("xubuntu", "xubuntu-base"):
             if series <= "intrepid":
                 desktop_ram = 128
             else:
@@ -609,6 +623,12 @@
                 sentences.append(
                     "You can install additional educational programs using "
                     "the classroom server add-on %s." % cd)
+        elif publish_type == "base" and \
+             (self.project == "xubuntu-base" or self.project == "ubuntu-mate-base"):
+            sentences.append(
+                "The base %s allows you to try %s without changing your "
+                "computer at all, and at your option to install it "
+                "permanently later." % (cd, capproject))
         elif publish_type == "install":
             sentences.append(
                 "The install %s allows you to install %s permanently on a "
@@ -1107,6 +1127,7 @@
 
         all_publish_types = (
             "live", "desktop",
+            "base",
             "server", "install", "alternate",
             "serveraddon", "addon",
             "dvd",