Skip to content

Detect Azure Linux properly #2989

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

Merged
daandemeyer merged 2 commits into from
Aug 30, 2024
Merged

Detect Azure Linux properly #2989

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
19fac8e
azure: Don't try to install erofs-utils
daandemeyer Aug 30, 2024
ff539d2
Detect Azure Linux properly
daandemeyer Aug 29, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mkosi/distributions/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,13 @@ def detect_distribution() -> tuple[Optional[Distribution], Optional[str]]:
version_id = os_release.get("VERSION_ID", None)
version_codename = os_release.get("VERSION_CODENAME", None)

quirks = {
"azurelinux": Distribution.azure,
}

d: Optional[Distribution] = None
for the_id in [dist_id, *dist_id_like]:
d = Distribution.__members__.get(the_id, None)
d = Distribution.__members__.get(the_id, quirks.get(the_id))
if d is not None:
break

Expand Down
1 change: 0 additions & 1 deletion mkosi/resources/mkosi-tools/mkosi.conf.d/10-azure.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Packages=
distribution-gpg-keys
dnf5
dnf5-plugins
erofs-utils
qemu-system-aarch64-core
qemu-system-s390x-core
systemd-ukify