xubuntu-dev team mailing list archive
-
xubuntu-dev team
-
Mailing list archive
-
Message #04630
[Merge] lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base into lp:ubuntu-cdimage
Sean Davis has proposed merging lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base into lp:ubuntu-cdimage.
Commit message:
Add xubuntu-base to ubuntu-cdimage
Requested reviews:
Ubuntu CD Image Team (ubuntu-cdimage)
For more details, see:
https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/xubuntu-base/+merge/347320
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
--
Your team Xubuntu Developers is subscribed to branch lp:~xubuntu-dev/ubuntu-cdimage/xubuntu-base.
=== modified file 'bin/daily-checks'
--- bin/daily-checks 2018-05-02 22:06:50 +0000
+++ bin/daily-checks 2018-06-02 01:10:16 +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):
@@ -242,6 +242,7 @@
'kubuntu',
'edubuntu',
'xubuntu',
+ 'xubuntu-base',
'ubuntustudio',
'ubuntu-netbook',
'kubuntu-netbook',
=== modified file 'etc/config'
--- etc/config 2018-05-11 18:15:52 +0000
+++ etc/config 2018-06-02 01:10:16 +0000
@@ -53,7 +53,7 @@
ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate}"
;;
*)
- ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
+ ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu xubuntu-base ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
;;
esac
=== modified file 'etc/crontab'
--- etc/crontab 2018-05-04 04:02:06 +0000
+++ etc/crontab 2018-06-02 01:10:16 +0000
@@ -33,6 +33,7 @@
30 8 * * * for-project ubuntu-core cron.daily-live --live
14 5 * * * for-project kubuntu cron.daily-live --live
50 1 * * * for-project xubuntu cron.daily-live --live
+50 2 * * * for-project xubuntu-base cron.daily-live --live
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
17 18 * * * for-project ubuntustudio cron.dvd --live
29 16 * * * for-project lubuntu cron.daily-live --live
=== modified file 'etc/default-arches'
--- etc/default-arches 2018-05-22 18:23:25 +0000
+++ etc/default-arches 2018-06-02 01:10:16 +0000
@@ -114,6 +114,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 2017-10-19 09:55:35 +0000
+++ etc/qa-products 2018-06-02 01:10:16 +0000
@@ -103,5 +103,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 2018-01-09 01:47:28 +0000
+++ lib/cdimage/build.py 2018-06-02 01:10:16 +0000
@@ -100,6 +100,7 @@
"ubuntu-mate",
"ubuntu-moblin-remix",
"ubuntu-mid",
+ "xubuntu-base",
):
config["CDIMAGE_UNSUPPORTED"] = "1"
=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py 2018-05-29 03:36:12 +0000
+++ lib/cdimage/germinate.py 2018-06-02 01:10:16 +0000
@@ -81,7 +81,7 @@
sources.insert(0, bzrpattern % "ubuntustudio-dev")
elif project == "mythbuntu":
sources.insert(0, bzrpattern % "mythbuntu-dev")
- elif project == "xubuntu":
+ elif project in ("xubuntu", "xubuntu-base"):
if series >= "intrepid":
sources.insert(0, gitpattern % "xubuntu-dev")
else:
=== modified file 'lib/cdimage/project.py'
--- lib/cdimage/project.py 2017-05-01 02:22:20 +0000
+++ lib/cdimage/project.py 2018-06-02 01:10:16 +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",
=== modified file 'lib/cdimage/tests/test_build.py'
--- lib/cdimage/tests/test_build.py 2018-01-09 01:47:28 +0000
+++ lib/cdimage/tests/test_build.py 2018-06-02 01:10:16 +0000
@@ -560,6 +560,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),
=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py 2018-05-29 03:40:05 +0000
+++ lib/cdimage/tests/test_germinate.py 2018-06-02 01:10:16 +0000
@@ -113,6 +113,7 @@
("ubuntu", "raring", ["ubuntu-core-dev"]),
("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
+ ("xubuntu-base", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
("ubuntukylin", "utopic", ["ubuntukylin-members", "ubuntu-core-dev"]),
):
self.config["DIST"] = series
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py 2018-05-02 22:06:50 +0000
+++ lib/cdimage/tests/test_tree.py 2018-06-02 01:10:16 +0000
@@ -293,7 +293,8 @@
self.assertEqual(publish_type, publisher.publish_type)
if "_" not in image_type:
self.assertEqual(
- image_type, Publisher._guess_image_type(publish_type))
+ image_type, Publisher._guess_image_type(publish_type,
+ project))
class TestPublisherWebIndices(TestCase):
@@ -750,6 +751,7 @@
("xubuntu", "quantal", "daily-live", "i386", 736665600),
("xubuntu", "raring", "daily-live", "i386", 1073741824),
("xubuntu", "xenial", "daily-live", "i386", 1460000000),
+ ("xubuntu-base", "bionic", "daily-live", "i386", 736665600),
("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
("ubuntu-gnome", "xenial", "daily-live", "i386", 2000000000),
("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000),
@@ -1286,6 +1288,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"),
@@ -1359,6 +1362,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"),
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py 2018-04-26 23:41:37 +0000
+++ lib/cdimage/tree.py 2018-06-02 01:10:16 +0000
@@ -82,6 +82,7 @@
"ubuntukylin",
"ubuntustudio",
"xubuntu",
+ "xubuntu-base",
]
@@ -161,6 +162,8 @@
"""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")
else:
return os.path.join(self.directory, self.config.project)
@@ -253,7 +256,7 @@
config["IMAGE_TYPE"] = options.image_type
elif options.publish_type:
config["IMAGE_TYPE"] = DailyTreePublisher._guess_image_type(
- options.publish_type)
+ options.publish_type, options.project)
if not config["IMAGE_TYPE"]:
parser.error(
"unrecognised publish type '%s'" % options.publish_type)
@@ -406,6 +409,8 @@
return "live-server"
elif self.project == "ubuntu-core":
return "live-core"
+ elif self.project == "xubuntu-base":
+ return "base"
else:
if self.config["DIST"] <= "breezy":
return "live"
@@ -438,13 +443,15 @@
# Keep this in sync with publish_type above.
@staticmethod
- def _guess_image_type(publish_type):
+ def _guess_image_type(publish_type, project = None):
if publish_type.startswith("preinstalled-"):
return "daily-preinstalled"
elif publish_type in (
"desktop", "live", "mid", "moblin-remix", "netbook",
"live-core", "live-server"):
return "daily-live"
+ elif publish_type == "base" and project == "xubuntu-base":
+ return "daily-live"
elif publish_type == "dvd":
return "dvd"
elif publish_type in (
@@ -501,6 +508,8 @@
return "Ubuntu Core %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":
@@ -558,7 +567,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:
@@ -622,6 +631,11 @@
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":
+ 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 "
@@ -1136,6 +1150,7 @@
all_publish_types = (
"live", "desktop",
+ "base",
"live-server",
"server", "install", "alternate",
"serveraddon", "addon",
Follow ups
