From 8ffacf8efa97a8c375dda46dc6d9c4a1940b6fa2 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 18 Apr 2025 15:59:41 +0200 Subject: [PATCH 1/2] mkosi: Replace base-devel with base in arch tools packages base-devel pulls in a bit too much, especially for NO_BUILD builds so let's use base instead. --- mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf index 20e7abc14a..66acf0462a 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf @@ -9,9 +9,10 @@ Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf [Content] PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare Packages= - base-devel + base github-cli lcov mypy + pkgconf ruff shellcheck From 46833d6c8fbd9ae4379043e54edb1009b9829e0e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 18 Apr 2025 16:03:09 +0200 Subject: [PATCH 2/2] mkosi: Add clang tools and iwyu to tools tree --- mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf | 1 + mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf | 1 + mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf | 2 ++ mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf | 1 + mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf | 2 ++ 5 files changed, 7 insertions(+) diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf index 66acf0462a..382391ca70 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf @@ -10,6 +10,7 @@ Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare Packages= base + clang-tools-extra github-cli lcov mypy diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf index 268539f1ff..1d61fd71ee 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf @@ -10,5 +10,6 @@ Include=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf [Content] PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare Packages= + clang-tools-extra python3-mypy rpm-build diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf index 6bbfab78d6..747b2b2000 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf @@ -10,7 +10,9 @@ Include=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf [Content] PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare Packages= + clang-tools gh + iwyu lcov mypy shellcheck diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf index e32cf27e98..6931423b19 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf @@ -5,6 +5,7 @@ Distribution=fedora [Content] Packages= + iwyu lcov gh ruff diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf index 77d54130f7..745476d171 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf @@ -9,7 +9,9 @@ Include=%D/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf [Content] PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare Packages= + clang-tools gh + include-what-you-use lcov mypy python3-ruff