From 3f3b4959e2cb9bca1e1ed527a0692c9a8b6a18ea Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Fri, 29 Nov 2024 02:30:34 +0100 Subject: [PATCH] mkosi: install correct package for mypy Package "mypy" doesn't exist on all distro, install the correct package depending on the distro. --- mkosi.conf.d/05-tools/mkosi.conf | 1 - mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf | 1 + mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf | 1 + mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf | 1 + mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mkosi.conf.d/05-tools/mkosi.conf b/mkosi.conf.d/05-tools/mkosi.conf index 02bf2aaddaf..746dd37870f 100644 --- a/mkosi.conf.d/05-tools/mkosi.conf +++ b/mkosi.conf.d/05-tools/mkosi.conf @@ -5,5 +5,4 @@ ToolsTreePackages= gcc gperf meson - mypy pkgconf diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf index e26efa49cc8..7aba50248a8 100644 --- a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf @@ -9,6 +9,7 @@ ToolsTreePackages= github-cli libcap libmicrohttpd + mypy python-jinja python-pytest ruff diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf index 86315b773a2..23731f7376c 100644 --- a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf @@ -15,5 +15,6 @@ ToolsTreePackages= pkgconfig(mount) tpm2-tss-devel python3-jinja2 + python3-mypy python3-pytest shellcheck diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf index 5c7e06c7719..46204fe8f63 100644 --- a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf @@ -15,6 +15,7 @@ ToolsTreePackages= libmicrohttpd-dev libmount-dev libtss2-dev + mypy python3-jinja2 python3-pytest shellcheck diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf index 6a9b21bd907..9c56164f326 100644 --- a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf @@ -6,6 +6,7 @@ ToolsTreeDistribution=opensuse [Build] ToolsTreePackages= gh + mypy pkgconfig(blkid) pkgconfig(libcap) pkgconfig(libcryptsetup) -- 2.47.3