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 3141ed4451f9932266bd86e6b9246ad1cf45f897..a24aa1e443b969b00444a7f59540646a9b0dd8b5 100644 (file)
--- 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 01cd7dc36367e60faeff57ca6c7aed03d117efa8..7f9877284293b06eca5885a4d529d483379174b0 100644 (file)
--- 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 2194c0082908cddbef385052bf9faab65426998d..3383d3cf915f7f99c5dd8a2235e3254c6fa7e7af 100644 (file)
--- 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 ec76a9c9c10e6027bd87b2331e3e05465af4744c..e27e7e27cf3eb9f1368eee73a2999179b438137f 100644 (file)
--- 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 5f0c247f2a3709a813e1e59b494c36a7d650a6fe..83ebffcb6622d9dacfb4c4ccc80cbd7ebc5a7764 100644 (file)
--- 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 3bcfa24c6d90b41d7dfb97d67ce577ae68a7c150..ac6558601c3047c9a731dd62af8fd7596a8c646d 100644 (file)
--- 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 6c6fee120c6cb716763f124a043e870292de7119..87685034c64f527751fc768fdb945a59147984ad 100644 (file)
--- 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 b6b0d3a2df113e4cc42bb74905a88face4cc74e6..13cf6245b325ddc89fd0864517ebbafc857fcba1 100644 (file)
--- 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)