[Merge] ~edubuntu-dev/ubuntu-cdimage:main into ubuntu-cdimage:main
Steve Langasek
mp+437167 at code.launchpad.net
Sun Feb 12 05:43:35 UTC 2023
Review: Needs Fixing
Diff comments:
> diff --git a/bin/cron.daily b/bin/cron.daily
> index f2d9ab0..a97fd9b 100755
> --- a/bin/cron.daily
> +++ b/bin/cron.daily
> @@ -37,8 +37,10 @@ def main():
> config["CDIMAGE_INSTALL"] = "1"
> project = config.project
> series = config["DIST"]
> - if (project == "ubuntu-server" and series >= "trusty" and
> - not config["CDIMAGE_NO_SQUASHFS_BASE"]):
> + if project == "edubuntu":
> + config["CDIMAGE_ADDON"] = "1"
Now that Ubuntu Server has moved to live images, we no longer use this script at all. You should not touch it, but use cron.daily-live instead.
> + elif (project == "ubuntu-server" and series >= "trusty" and
> + not config["CDIMAGE_NO_SQUASHFS_BASE"]):
> config["CDIMAGE_SQUASHFS_BASE"] = "1"
> if not build_image_set(config, options):
> sys.exit(1)
> diff --git a/bin/cron.dvd b/bin/cron.dvd
> index 3732b09..7391e54 100755
> --- a/bin/cron.dvd
> +++ b/bin/cron.dvd
> @@ -35,7 +35,7 @@ def main():
> options, _ = parser.parse_args()
> config = Config(IMAGE_TYPE="dvd")
> project = config.project
> - if project not in ("ubuntu", "ubuntustudio"):
> + if project not in ("edubuntu", "ubuntu", "ubuntustudio"):
This is only relevant if you are making a 'dvd' image instead of a 'live' image. UbuntuStudio are the only flavor currently making DVD images, and I don't know the history there offhand given that none of our other live images fit on CDs anymore either. I recommend not changing this code - you're only going to be using one of cron.daily-live or cron.dvd anyway, and I think cron.daily-live is the right one to use.
> config["CDIMAGE_INSTALL"] = "1"
> config["CDIMAGE_LIVE"] = "1"
> config["CDIMAGE_DVD"] = "1"
> diff --git a/etc/livefs-launchpad b/etc/livefs-launchpad
> index d4fced2..88a279c 100644
> --- a/etc/livefs-launchpad
> +++ b/etc/livefs-launchpad
> @@ -7,6 +7,7 @@ ubuntu-legacy daily-legacy * * ubuntu-cdimage/ubuntu-legacy
> ubuntu-canary daily-live * disco- ubuntu-cdimage/ubuntu-canary
> ubuntu-desktop-preinstalled daily-preinstalled focal- * ubuntu-cdimage/ubuntu-preinstalled
> kubuntu daily-live * * ubuntu-cdimage/kubuntu
> +edubuntu dvd * * ubuntu-cdimage/edubuntu
> xubuntu daily-live * * ubuntu-cdimage/xubuntu
per previous comment, I think this should be daily-live, not dvd.
> ubuntu-server daily trusty- * ubuntu-cdimage/ubuntu-server
> ubuntu-server daily-preinstalled xenial- * ubuntu-cdimage/cpc
> diff --git a/etc/qa-products b/etc/qa-products
> index ea32841..35b1d3b 100644
> --- a/etc/qa-products
> +++ b/etc/qa-products
> @@ -1,5 +1,9 @@
> # QA PRODUCT PROJECT IMAGE_TYPE PUBLISH_TYPE ARCHITECTURE TRACKER
>
> +# Edubuntu
> +Edubuntu DVD amd64 edubuntu dvd dvd amd64 iso
> +Edubuntu DVD i386 edubuntu dvd dvd i386 iso
> +
""
> # Kubuntu
> Kubuntu Desktop amd64 kubuntu daily-live desktop amd64 iso
> Kubuntu Desktop amd64+mac kubuntu daily-live desktop amd64+mac iso
> diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
> index af88a5f..eaa3498 100644
> --- a/lib/cdimage/germinate.py
> +++ b/lib/cdimage/germinate.py
> @@ -325,7 +325,11 @@ class GerminateOutput:
> if seed not in ship:
> yield seed
> elif mode == "dvd":
> - if project == "ubuntu":
> + if project == "edubuntu":
> + # no inheritance; most of this goes on the live filesystem
> + yield "dvd"
The edubuntu dvd seed still says:
Include what we need for LTSP.
# ltsp-server-standalone [amd64]
This looks like legacy stuff that needs to be cleaned up, not propagated into the build system...
> + yield "ship-live"
> + elif project == "ubuntu":
> # no inheritance; most of this goes on the live filesystem
> yield "usb-langsupport"
> yield "usb-ship-live"
> @@ -379,6 +383,11 @@ class GerminateOutput:
>
> found = False
> for seed in self.master_seeds():
> + # https://blueprints.launchpad.net/ubuntu/+spec/edubuntu-on-two-cds
> + if (self.config["CDIMAGE_DVD"] != "1" and
> + self.config["CDIMAGE_ADDON"] != "1" and
> + seed == "ship-addon"):
> + yield "FORCE-CD-BREAK"
This looks like resuscitation of old code that is almost certainly not what you want for the reinvented edubuntu.
> if source:
> yield "#include <source/%s/%s:%s>" % (series, project, seed)
> else:
> @@ -518,7 +527,14 @@ class GerminateOutput:
> continue
> input_seeds = [seed] + headers.get("seeds", "").split()
> if "per-derivative" in headers:
> - task = "%s-%s" % (task_project, task)
> + # Edubuntu is odd; it's structured as an add-on to
> + # Ubuntu, so sometimes we need to create ubuntu-* tasks.
> + # At the moment I don't see a better approach than
> + # hardcoding the task names.
> + if project == "edubuntu" and task in ("desktop", "live"):
> + task = "ubuntu-%s" % task
> + else:
> + task = "%s-%s" % (task_project, task)
As above, this is only true if you are not intending to ship it as a live CD, which your new seeds suggest is the intent.
>
> yield input_seeds, task
>
> diff --git a/lib/cdimage/livefs.py b/lib/cdimage/livefs.py
> index 4ed11ba..292ed86 100644
> --- a/lib/cdimage/livefs.py
> +++ b/lib/cdimage/livefs.py
> @@ -138,7 +138,7 @@ def live_project(config, arch):
> liveproject = config.livefs_project_for_arch(arch)
>
> if config["CDIMAGE_DVD"]:
> - if config.project in ("ubuntu", "kubuntu", "ubuntustudio"):
> + if config.project in ("ubuntu", "kubuntu", "edubuntu", "ubuntustudio"):
> liveproject += "-dvd"
not incorrect, but also immaterial if you're not using cron.dvd
>
> return liveproject
> diff --git a/lib/cdimage/tests/test_build.py b/lib/cdimage/tests/test_build.py
> index d7e5dbc..0f011d3 100644
> --- a/lib/cdimage/tests/test_build.py
> +++ b/lib/cdimage/tests/test_build.py
> @@ -591,6 +591,7 @@ class TestBuildImageSet(TestCase):
> for project, series, onlyfree, unsupported in (
> ("ubuntu", "trusty", False, False),
> ("gobuntu", "hardy", True, False),
> + ("edubuntu", "precise", False, True),
No, please use only current series names when adding tests. This list already needs significant cleanup.
> ("xubuntu", "precise", False, True),
> ("kubuntu", "precise", False, False),
> ("kubuntu", "trusty", False, True),
> diff --git a/lib/cdimage/tests/test_tree.py b/lib/cdimage/tests/test_tree.py
> index c293665..c927db6 100644
> --- a/lib/cdimage/tests/test_tree.py
> +++ b/lib/cdimage/tests/test_tree.py
> @@ -257,6 +257,7 @@ class TestPublisher(TestCase):
> "preinstalled-desktop"),
> ("daily-preinstalled", "ubuntu-touch", "trusty",
> "preinstalled-touch"),
> + ("daily-live", "edubuntu", "precise", "desktop"),
precise->lunar
> ("daily-live", "kubuntu-netbook", "precise", "netbook"),
> ("daily-live", "ubuntu-server", "precise", "live-server"),
> ("daily-live", "ubuntu", "precise", "desktop"),
> @@ -264,6 +265,7 @@ class TestPublisher(TestCase):
> ("daily-live", "ubuntu-core", "xenial", "live-core"),
> ("ports_dvd", "ubuntu", "precise", "dvd"),
> ("dvd", "kubuntu", "precise", "dvd"),
> + ("daily", "edubuntu", "precise", "addon"),
almost certainly wrong
> ("daily", "ubuntu-base", "precise", "base"),
> ("daily", "ubuntu-server", "precise", "server"),
> ("daily", "ubuntu-server", "focal", "legacy-server"),
--
https://code.launchpad.net/~edubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/437167
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/ubuntu-cdimage:main.
More information about the Ubuntu-reviews
mailing list