EOF
# TODO: Use $SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT once we drop support for Ubuntu Noble.
- sed -i 's/return "btrfs"/return "ext4"/' mkosi/distributions/*.py
+ sed -i 's/return "btrfs"/return "ext4"/' mkosi/distribution/*.py
# fail if the script already exists, to avoid hard to debug CI errors
[[ -f mkosi.configure ]] && exit 1
used:
- Add the distribution to the `Distribution` enum
-- Add the implementation of the distribution in `mkosi/distributions`.
+- Add the implementation of the distribution in `mkosi/distribution`.
If the distribution is a variant of an existing distribution, inherit
from the existing distribution's installer class and only override the
necessary methods.
yes_no,
)
from mkosi.context import Context
-from mkosi.distributions import Distribution, detect_distribution
+from mkosi.distribution import Distribution, detect_distribution
from mkosi.documentation import show_docs
from mkosi.installer import clean_package_manager_metadata
from mkosi.kmod import (
systemd_tool_version,
)
from mkosi.context import Context
-from mkosi.distributions import Distribution
+from mkosi.distribution import Distribution
from mkosi.log import complete_step, die, log_step
from mkosi.partition import Partition
from mkosi.run import CompletedProcess, run, workdir
from pathlib import Path
from typing import Any, Callable, ClassVar, Generic, Optional, Protocol, TypeVar, Union, cast
-from mkosi.distributions import Distribution, detect_distribution
+from mkosi.distribution import Distribution, detect_distribution
from mkosi.log import ARG_DEBUG, ARG_DEBUG_SANDBOX, ARG_DEBUG_SHELL, complete_step, die
from mkosi.pager import page
from mkosi.run import SandboxProtocol, find_binary, nosandbox, run, sandbox_cmd, workdir
@property
def installer(self) -> type["DistributionInstaller"]:
- importlib.import_module(f"mkosi.distributions.{self.name}")
+ importlib.import_module(f"mkosi.distribution.{self.name}")
return DistributionInstaller.registry[self]
# SPDX-License-Identifier: LGPL-2.1-or-later
from mkosi.context import Context
-from mkosi.distributions import Distribution, centos, join_mirror
+from mkosi.distribution import Distribution, centos, join_mirror
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey
from mkosi.log import die
from mkosi.config import Architecture, Config
from mkosi.context import Context
from mkosi.curl import curl
-from mkosi.distributions import Distribution, DistributionInstaller, PackageType, join_mirror
+from mkosi.distribution import Distribution, DistributionInstaller, PackageType, join_mirror
from mkosi.installer.pacman import Pacman, PacmanRepository
from mkosi.log import complete_step, die
from mkosi.config import Architecture
from mkosi.context import Context
-from mkosi.distributions import (
+from mkosi.distribution import (
Distribution,
fedora,
join_mirror,
from mkosi.config import Architecture, Config
from mkosi.context import Context
from mkosi.curl import curl
-from mkosi.distributions import (
+from mkosi.distribution import (
Distribution,
DistributionInstaller,
PackageType,
from mkosi.config import Architecture, Config
from mkosi.context import Context
-from mkosi.distributions import Distribution, DistributionInstaller
+from mkosi.distribution import Distribution, DistributionInstaller
from mkosi.installer import PackageManager
from mkosi.config import Architecture, Config
from mkosi.context import Context
from mkosi.curl import curl
-from mkosi.distributions import Distribution, DistributionInstaller, PackageType, join_mirror
+from mkosi.distribution import Distribution, DistributionInstaller, PackageType, join_mirror
from mkosi.installer.apt import Apt, AptRepository
from mkosi.log import die
from mkosi.run import run, workdir
from mkosi.config import Architecture, Config
from mkosi.context import Context
from mkosi.curl import curl
-from mkosi.distributions import (
+from mkosi.distribution import (
Distribution,
DistributionInstaller,
PackageType,
from mkosi.config import Architecture
from mkosi.context import Context
-from mkosi.distributions import Distribution, debian
+from mkosi.distribution import Distribution, debian
from mkosi.installer.apt import AptRepository
from mkosi.log import die
from mkosi.config import Architecture
from mkosi.context import Context
-from mkosi.distributions import Distribution, fedora, join_mirror
+from mkosi.distribution import Distribution, fedora, join_mirror
from mkosi.installer.dnf import Dnf
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey
from mkosi.log import die
from mkosi.config import Architecture
from mkosi.context import Context
-from mkosi.distributions import Distribution, fedora, join_mirror
+from mkosi.distribution import Distribution, fedora, join_mirror
from mkosi.installer.dnf import Dnf
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey
from mkosi.log import die
from mkosi.config import Architecture, Config
from mkosi.context import Context
from mkosi.curl import curl
-from mkosi.distributions import Distribution, DistributionInstaller, PackageType, join_mirror
+from mkosi.distribution import Distribution, DistributionInstaller, PackageType, join_mirror
from mkosi.installer.dnf import Dnf
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey, setup_rpm
from mkosi.installer.zypper import Zypper
from mkosi.config import Architecture, Config
from mkosi.context import Context
-from mkosi.distributions import Distribution, DistributionInstaller, PackageType
+from mkosi.distribution import Distribution, DistributionInstaller, PackageType
from mkosi.installer import PackageManager
from mkosi.installer.apk import Apk, ApkRepository
from mkosi.log import complete_step, die
from typing import Any, Optional
from mkosi.context import Context
-from mkosi.distributions import Distribution, centos, join_mirror
+from mkosi.distribution import Distribution, centos, join_mirror
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey
from mkosi.log import die
from mkosi.run import exists_in_sandbox, glob_in_sandbox
from collections.abc import Iterable
from mkosi.context import Context
-from mkosi.distributions import Distribution, centos, join_mirror
+from mkosi.distribution import Distribution, centos, join_mirror
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey
from mkosi.log import die
# SPDX-License-Identifier: LGPL-2.1-or-later
from mkosi.context import Context
-from mkosi.distributions import Distribution, centos, join_mirror
+from mkosi.distribution import Distribution, centos, join_mirror
from mkosi.installer.rpm import RpmRepository, find_rpm_gpgkey
from mkosi.log import die
from mkosi.config import Config
from mkosi.context import Context
from mkosi.curl import curl
-from mkosi.distributions import Distribution, debian, join_mirror
+from mkosi.distribution import Distribution, debian, join_mirror
from mkosi.installer.apt import AptRepository
from mkosi.log import die
from mkosi.util import startswith
from mkosi.config import Config
from mkosi.context import Context
-from mkosi.distributions import detect_distribution
+from mkosi.distribution import detect_distribution
from mkosi.installer import PackageManager
from mkosi.log import complete_step
from mkosi.run import CompletedProcess, run, workdir
from typing import Literal, Optional, overload
from mkosi.context import Context
-from mkosi.distributions import Distribution
+from mkosi.distribution import Distribution
from mkosi.log import die
from mkosi.run import glob_in_sandbox
from mkosi.util import PathString
from mkosi.config import ManifestFormat, OutputFormat
from mkosi.context import Context
-from mkosi.distributions import PackageType
+from mkosi.distribution import PackageType
from mkosi.installer.apt import Apt
from mkosi.installer.pacman import Pacman
from mkosi.log import complete_step
[tool.setuptools]
packages = [
"mkosi",
- "mkosi.distributions",
+ "mkosi.distribution",
"mkosi.installer",
"mkosi.resources",
]
import pytest
-from mkosi.distributions import Distribution
+from mkosi.distribution import Distribution
from mkosi.run import CompletedProcess, fork_and_wait, run
from mkosi.sandbox import acquire_privileges
from mkosi.tree import rmtree
import mkosi.resources
from mkosi.config import parse_config
-from mkosi.distributions import Distribution, detect_distribution
+from mkosi.distribution import Distribution, detect_distribution
from mkosi.log import log_setup
from mkosi.util import resource_path
import pytest
from mkosi.config import Bootloader, Firmware, OutputFormat
-from mkosi.distributions import Distribution
+from mkosi.distribution import Distribution
from mkosi.qemu import find_virtiofsd
from mkosi.run import find_binary, run
from mkosi.sandbox import userns_has_single_user
parse_config,
parse_ini,
)
-from mkosi.distributions import Distribution, detect_distribution
+from mkosi.distribution import Distribution, detect_distribution
from mkosi.util import chdir, resource_path
VsockCID,
dump_json,
)
-from mkosi.distributions import Distribution
+from mkosi.distribution import Distribution
@pytest.mark.parametrize("path", [None, "/baz/qux"])
projects / thirdparty / mkosi.git / commitdiff
