From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 20 Feb 2024 13:40:59 +0000 (+0100)
Subject: ubuntu: Use ubuntu itself as the default tools tree distribution
X-Git-Tag: v21~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c12ae85dc129b48ea53a60085caea212dd7cafad;p=thirdparty%2Fmkosi.git

ubuntu: Use ubuntu itself as the default tools tree distribution

Now that we default to noble which has all the necessary tools, let's
use ubuntu itself as the default tools tree distribution for ubuntu.
---

diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py
index 7b07f2153..07be74c9c 100644
--- a/mkosi/distributions/ubuntu.py
+++ b/mkosi/distributions/ubuntu.py
@@ -4,7 +4,7 @@ from collections.abc import Iterable
 from pathlib import Path
 
 from mkosi.context import Context
-from mkosi.distributions import debian
+from mkosi.distributions import Distribution, debian
 from mkosi.installer.apt import Apt
 from mkosi.util import listify
 
@@ -18,6 +18,10 @@ class Installer(debian.Installer):
     def default_release(cls) -> str:
         return "noble"
 
+    @classmethod
+    def default_tools_tree_distribution(cls) -> Distribution:
+        return Distribution.ubuntu
+
     @staticmethod
     @listify
     def repositories(context: Context, local: bool = True) -> Iterable[Apt.Repository]: