From: Daan De Meyer Date: Sat, 11 Jan 2025 10:00:26 +0000 (+0100) Subject: Drop support for Focal X-Git-Tag: v25~64^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3344%2Fhead;p=thirdparty%2Fmkosi.git Drop support for Focal It's going EOL in April, so I think it's fine if we drop support for it. --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index a59a11e23..e9148b471 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -1441,13 +1441,10 @@ def build_kernel_modules_initrd(context: Context, kver: str) -> Path: ) if context.config.distribution.is_apt_distribution(): - # Ubuntu Focal's kernel does not support zstd-compressed initrds so use xz instead. - if context.config.distribution == Distribution.ubuntu and context.config.release == "focal": - compression = Compression.xz # Older Debian and Ubuntu releases do not compress their kernel modules, so we compress the # initramfs instead. Note that this is not ideal since the compressed kernel modules will # all be decompressed on boot which requires significant memory. - elif context.config.distribution == Distribution.debian and context.config.release in ( + if context.config.distribution == Distribution.debian and context.config.release in ( "sid", "testing", ): diff --git a/mkosi/config.py b/mkosi/config.py index 37e164c74..f9ed77c08 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -836,10 +836,7 @@ def config_parse_mode(value: Optional[str], old: Optional[int]) -> Optional[int] def config_default_compression(namespace: argparse.Namespace) -> Compression: if namespace.output_format in (OutputFormat.tar, OutputFormat.cpio, OutputFormat.uki, OutputFormat.esp): - if namespace.distribution == Distribution.ubuntu and namespace.release == "focal": - return Compression.xz - else: - return Compression.zstd + return Compression.zstd elif namespace.output_format == OutputFormat.oci: return Compression.gz else: diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py index f9cd81374..745b34c6d 100644 --- a/mkosi/distributions/ubuntu.py +++ b/mkosi/distributions/ubuntu.py @@ -25,11 +25,8 @@ class Installer(debian.Installer): def repositories(cls, context: Context, local: bool = True) -> Iterable[AptRepository]: types = ("deb", "deb-src") - # From kinetic onwards, the usr-is-merged package is available in universe and is required by - # mkosi to set up a proper usr-merged system so we add the universe repository unconditionally. components = ( "main", - *(["universe"] if context.config.release not in ("focal", "jammy") else []), *context.config.repositories, ) diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md index cde614e31..b3edb7dff 100644 --- a/mkosi/resources/man/mkosi.1.md +++ b/mkosi/resources/man/mkosi.1.md @@ -392,7 +392,7 @@ sections. These are identical to triggering conditions except they apply to the entire match section instead of just a single condition. As an example, the following will match if the distribution is `debian` and the release is `bookworm` or if the distribution is `ubuntu` and the -release is `focal`. +release is `noble`. ```ini [TriggerMatch] @@ -401,7 +401,7 @@ Release=bookworm [TriggerMatch] Distribution=ubuntu -Release=focal +Release=noble ``` The semantics of conditions in `[TriggerMatch]` sections is the same as diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf index 7d41d76ff..bfe36320e 100644 --- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf +++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf @@ -7,7 +7,6 @@ Release=!bookworm [TriggerMatch] Distribution=ubuntu -Release=!focal Release=!jammy Release=!noble Release=!oracular diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-libtss.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-libtss.conf index 1e6a8bc55..44ac770b4 100644 --- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-libtss.conf +++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-libtss.conf @@ -1,14 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -[TriggerMatch] -Distribution=debian - -[TriggerMatch] -Distribution=kali - -[TriggerMatch] -Distribution=ubuntu -Release=!focal +[Match] +Distribution=|debian +Distribution=|kali +Distribution=|ubuntu [Content] Packages= diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/05-ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/05-ubuntu.conf new file mode 100644 index 000000000..ddde77513 --- /dev/null +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/05-ubuntu.conf @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=ubuntu + +[Distribution] +Repositories=main,universe diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/pkcs11-provider.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/pkcs11-provider.conf index 90e0bf744..6cb9aa884 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/pkcs11-provider.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/pkcs11-provider.conf @@ -7,7 +7,6 @@ Release=!bullseye [TriggerMatch] Distribution=ubuntu -Release=!focal Release=!jammy [TriggerMatch]