From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 2 Aug 2024 08:13:20 +0000 (+0200)
Subject: Use debian as the default tools tree again on Ubuntu
X-Git-Tag: v25~372^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82c2efe7ed1a457d3cd64b71600690331d28b99a;p=thirdparty%2Fmkosi.git

Use debian as the default tools tree again on Ubuntu

Debian has distribution-gpg-keys which Ubuntu doesn't. As we'll likely
keep running into similar scenarios in the future, let's just stick with
Debian as Ubuntu's default tools tree.
---

diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py
index a4aa73403..7d870975e 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 AptRepository
 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.debian
+
     @staticmethod
     @listify
     def repositories(context: Context, local: bool = True) -> Iterable[AptRepository]: