From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Wed, 6 Dec 2023 08:17:05 +0000 (+0100)
Subject: Make DistributionInstaller.architecture a classmethod
X-Git-Tag: v20~112^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2124%2Fhead;p=thirdparty%2Fmkosi.git

Make DistributionInstaller.architecture a classmethod

This was already done in CentOS, but not in the base class.
---

diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index 3141ed445..a24aa1e44 100644
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -47,8 +47,8 @@ class DistributionInstaller:
     def filesystem(cls) -> str:
         return "ext4"
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         return str(arch)
 
     @classmethod
diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index 01cd7dc36..7f9877284 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -96,8 +96,8 @@ class Installer(DistributionInstaller):
     def remove_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
         invoke_pacman(state, "--remove", ["--nosave", "--recursive"], packages)
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.x86_64 : "x86_64",
             Architecture.arm64  : "aarch64",
diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index 2194c0082..3383d3cf9 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -204,8 +204,8 @@ class Installer(DistributionInstaller):
     def remove_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
         invoke_apt(state, "apt-get", "purge", packages)
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.arm64       : "arm64",
             Architecture.arm         : "armhf",
diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index ec76a9c9c..e27e7e27c 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -180,8 +180,8 @@ class Installer(DistributionInstaller):
     def remove_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
         invoke_dnf(state, "remove", packages)
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.arm64     : "aarch64",
             Architecture.ia64      : "ia64",
diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index 5f0c247f2..83ebffcb6 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -180,8 +180,8 @@ class Installer(DistributionInstaller):
             if not vmlinuz.exists() and not vmlinuz.is_symlink():
                 vmlinuz.symlink_to(os.path.relpath(kimg, start=vmlinuz.parent))
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.x86_64 : "amd64",
             Architecture.arm64  : "arm64",
diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py
index 3bcfa24c6..ac6558601 100644
--- a/mkosi/distributions/mageia.py
+++ b/mkosi/distributions/mageia.py
@@ -83,8 +83,8 @@ class Installer(DistributionInstaller):
     def remove_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
         invoke_dnf(state, "remove", packages)
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.x86_64 : "x86_64",
             Architecture.arm64  : "aarch64",
diff --git a/mkosi/distributions/openmandriva.py b/mkosi/distributions/openmandriva.py
index 6c6fee120..87685034c 100644
--- a/mkosi/distributions/openmandriva.py
+++ b/mkosi/distributions/openmandriva.py
@@ -83,8 +83,8 @@ class Installer(DistributionInstaller):
     def remove_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
         invoke_dnf(state, "remove", packages)
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.x86_64  : "x86_64",
             Architecture.arm64   : "aarch64",
diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index b6b0d3a2d..13cf6245b 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -134,8 +134,8 @@ class Installer(DistributionInstaller):
         else:
             invoke_dnf(state, "remove", packages)
 
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
+    @classmethod
+    def architecture(cls, arch: Architecture) -> str:
         a = {
             Architecture.x86_64 : "x86_64",
         }.get(arch)