From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 28 Sep 2023 10:14:41 +0000 (+0200)
Subject: Add default implementations for a bunch of DistributionInstaller methods
X-Git-Tag: v18~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4060efbc65530f7fdc92b7eb3c393f58cdcfb4e;p=thirdparty%2Fmkosi.git

Add default implementations for a bunch of DistributionInstaller methods

Make it easier to add distributions by adding default implementations
for optional methods.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 5b3d6f04b..ca8c35581 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2250,12 +2250,16 @@ def finalize_tools(args: MkosiArgs, presets: Sequence[MkosiConfig]) -> Sequence[
             continue
 
         distribution = p.tools_tree_distribution or p.distribution.default_tools_tree_distribution()
+        if not distribution:
+            die(f"{p.distribution} does not have a default tools tree distribution",
+                hint="use ToolsTreeDistribution= to set one explicitly")
+
         release = p.tools_tree_release or distribution.default_release()
 
         cmdline = [
             "--directory", "",
             "--distribution", str(distribution),
-            "--release", release,
+            *(["--release", release] if release else []),
             *(["--mirror", p.mirror] if p.mirror and p.distribution == distribution else []),
             "--repository-key-check", str(p.repository_key_check),
             "--cache-only", str(p.cache_only),
diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index 3f0ee994d..d617318fc 100644
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -15,6 +15,7 @@ if TYPE_CHECKING:
 
 
 class PackageType(StrEnum):
+    none   = enum.auto()
     rpm    = enum.auto()
     deb    = enum.auto()
     pkg    = enum.auto()
@@ -40,27 +41,27 @@ class DistributionInstaller:
 
     @classmethod
     def filesystem(cls) -> str:
-        raise NotImplementedError()
+        return "ext4"
 
     @staticmethod
     def architecture(arch: Architecture) -> str:
-        raise NotImplementedError()
+        return str(arch)
 
     @classmethod
     def package_type(cls) -> PackageType:
-        raise NotImplementedError()
+        return PackageType.none
 
     @classmethod
     def default_release(cls) -> str:
-        raise NotImplementedError()
+        return ""
 
     @classmethod
-    def default_tools_tree_distribution(cls) -> "Distribution":
-        raise NotImplementedError()
+    def default_tools_tree_distribution(cls) -> Optional["Distribution"]:
+        return None
 
     @classmethod
     def tools_tree_packages(cls) -> list[str]:
-        raise NotImplementedError()
+        return []
 
 
 class Distribution(StrEnum):
@@ -116,7 +117,7 @@ class Distribution(StrEnum):
     def default_release(self) -> str:
         return self.installer().default_release()
 
-    def default_tools_tree_distribution(self) -> "Distribution":
+    def default_tools_tree_distribution(self) -> Optional["Distribution"]:
         return self.installer().default_tools_tree_distribution()
 
     def tools_tree_packages(self) -> list[str]: