Skip to content

Add a DistributionRelease object #3735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
behrmann wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Add a DistributionRelease object #3735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4441f3
Add a DistributionRelease object and make release matches comparable
behrmann Feb 6, 2025
2c0e1d7
conf: rewrite release matches using comparisons
behrmann Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions mkosi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
yes_no,
)
from mkosi.context import Context
from mkosi.distribution import Distribution, detect_distribution
from mkosi.distribution import Distribution, DistributionRelease, detect_distribution
from mkosi.documentation import show_docs
from mkosi.installer import clean_package_manager_metadata
from mkosi.kmod import (
Expand Down Expand Up @@ -667,7 +667,7 @@ def run_configure_scripts(config: Config) -> Config:

env = dict(
DISTRIBUTION=str(config.distribution),
RELEASE=config.release,
RELEASE=str(config.release),
ARCHITECTURE=str(config.architecture),
QEMU_ARCHITECTURE=config.architecture.to_qemu(),
DISTRIBUTION_ARCHITECTURE=config.distribution.installer.architecture(config.architecture),
Expand Down Expand Up @@ -715,7 +715,7 @@ def run_sync_scripts(config: Config) -> None:

env = dict(
DISTRIBUTION=str(config.distribution),
RELEASE=config.release,
RELEASE=str(config.release),
ARCHITECTURE=str(config.architecture),
DISTRIBUTION_ARCHITECTURE=config.distribution.installer.architecture(config.architecture),
SRCDIR="/work/src",
Expand Down Expand Up @@ -831,7 +831,7 @@ def run_prepare_scripts(context: Context, build: bool) -> None:

env = dict(
DISTRIBUTION=str(context.config.distribution),
RELEASE=context.config.release,
RELEASE=str(context.config.release),
ARCHITECTURE=str(context.config.architecture),
DISTRIBUTION_ARCHITECTURE=context.config.distribution.installer.architecture(
context.config.architecture
Expand Down Expand Up @@ -904,7 +904,7 @@ def run_build_scripts(context: Context) -> None:

env = dict(
DISTRIBUTION=str(context.config.distribution),
RELEASE=context.config.release,
RELEASE=str(context.config.release),
ARCHITECTURE=str(context.config.architecture),
DISTRIBUTION_ARCHITECTURE=context.config.distribution.installer.architecture(
context.config.architecture
Expand Down Expand Up @@ -984,7 +984,7 @@ def run_postinst_scripts(context: Context) -> None:

env = dict(
DISTRIBUTION=str(context.config.distribution),
RELEASE=context.config.release,
RELEASE=str(context.config.release),
ARCHITECTURE=str(context.config.architecture),
DISTRIBUTION_ARCHITECTURE=context.config.distribution.installer.architecture(
context.config.architecture
Expand Down Expand Up @@ -1058,7 +1058,7 @@ def run_finalize_scripts(context: Context) -> None:

env = dict(
DISTRIBUTION=str(context.config.distribution),
RELEASE=context.config.release,
RELEASE=str(context.config.release),
ARCHITECTURE=str(context.config.architecture),
DISTRIBUTION_ARCHITECTURE=context.config.distribution.installer.architecture(
context.config.architecture
Expand Down Expand Up @@ -1132,7 +1132,7 @@ def run_postoutput_scripts(context: Context) -> None:

env = dict(
DISTRIBUTION=str(context.config.distribution),
RELEASE=context.config.release,
RELEASE=str(context.config.release),
ARCHITECTURE=str(context.config.architecture),
DISTRIBUTION_ARCHITECTURE=context.config.distribution.installer.architecture(
context.config.architecture
Expand Down Expand Up @@ -3481,12 +3481,14 @@ def make_image(
cmdline += ["--definitions", workdir(d)]
opts += ["--ro-bind", d, workdir(d)]

def can_orphan_file(distribution: Union[Distribution, str, None], release: Optional[str]) -> bool:
def can_orphan_file(
distribution: Union[Distribution, str, None], release: Optional[DistributionRelease]
) -> bool:
if not isinstance(distribution, Distribution):
return True

return not (
(distribution == Distribution.centos and release and GenericVersion(release) == 9)
(distribution == Distribution.centos and release and release == 9)
or (distribution == Distribution.ubuntu and release == "jammy")
)

Expand Down Expand Up @@ -4187,7 +4189,7 @@ def run_box(args: Args, config: Config) -> None:
if hd:
env |= {"MKOSI_HOST_DISTRIBUTION": str(hd)}
if hr:
env |= {"MKOSI_HOST_RELEASE": hr}
env |= {"MKOSI_HOST_RELEASE": str(hr)}
if config.tools() != Path("/"):
env |= {"MKOSI_DEFAULT_TOOLS_TREE_PATH": os.fspath(config.tools())}

Expand Down Expand Up @@ -4602,7 +4604,7 @@ def run_clean_scripts(config: Config) -> None:

env = dict(
DISTRIBUTION=str(config.distribution),
RELEASE=config.release,
RELEASE=str(config.release),
ARCHITECTURE=str(config.architecture),
DISTRIBUTION_ARCHITECTURE=config.distribution.installer.architecture(config.architecture),
SRCDIR="/work/src",
Expand Down
Loading
Loading