From: Daan De Meyer Date: Wed, 31 Jan 2024 14:59:05 +0000 (+0100) Subject: Fix custom distribution builds X-Git-Tag: v21~76^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00d83a52fdf28ca820d94839f9922d0f60f44ea3;p=thirdparty%2Fmkosi.git Fix custom distribution builds --- diff --git a/mkosi/distributions/custom.py b/mkosi/distributions/custom.py index 89f0ea38b..0439a5eb2 100644 --- a/mkosi/distributions/custom.py +++ b/mkosi/distributions/custom.py @@ -2,9 +2,10 @@ from collections.abc import Sequence -from mkosi.config import Architecture +from mkosi.config import Architecture, Config from mkosi.context import Context from mkosi.distributions import DistributionInstaller +from mkosi.installer import PackageManager from mkosi.log import die @@ -13,6 +14,10 @@ class Installer(DistributionInstaller): def architecture(cls, arch: Architecture) -> str: return str(arch) + @classmethod + def package_manager(cls, config: Config) -> type[PackageManager]: + return PackageManager + @classmethod def setup(cls, context: Context) -> None: pass diff --git a/mkosi/installer/__init__.py b/mkosi/installer/__init__.py index d36fd076d..95674fab5 100644 --- a/mkosi/installer/__init__.py +++ b/mkosi/installer/__init__.py @@ -15,15 +15,15 @@ from mkosi.util import flatten class PackageManager: @classmethod def subdir(cls, config: Config) -> Path: - raise NotImplementedError + return Path("custom") @classmethod def cache_subdirs(cls, cache: Path) -> list[Path]: - raise NotImplementedError + return [] @classmethod def scripts(cls, context: Context) -> dict[str, list[PathString]]: - raise NotImplementedError + return {} @classmethod def mounts(cls, context: Context) -> list[PathString]: