From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 19 Feb 2025 14:21:18 +0000 (+0100)
Subject: Clean up default tools tree package lists
X-Git-Tag: v26~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ca539ebaa67cbdd9ab65bf71ed5a3acc8439593;p=thirdparty%2Fmkosi.git

Clean up default tools tree package lists

- util-linux is not needed anymore since we do mounts ourselves now
- dpkg is pulled in by apt on arch and we don't list it explicitly elsewhere
- glibc-gconv-modules-extra should be pulled in by something else on opensuse by now
- python3-cryptography is only required on ubuntu, rest already has a dependency on
  it in systemd-ukify or is already on systemd v257 which doesn't need it anymore
- libarchive-tools seems like a leftover that isn't installed anywhere else
---

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf
index 0db253994..cd9127200 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf
@@ -25,6 +25,5 @@ Packages=
         openssl
         systemd
         tar
-        util-linux
         xfsprogs
         zstd
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/arch.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/arch.conf
index ad52ace98..0301929a0 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/arch.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/arch.conf
@@ -12,7 +12,6 @@ Packages=
         libseccomp
         pacman
         pkcs11-provider
-        python-cryptography
         sbsigntools
         squashfs-tools
         systemd-ukify
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf
index 0a5340a50..c1ad0ff4a 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf
@@ -14,7 +14,6 @@ Packages=
         grub2-tools
         libseccomp
         policycoreutils
-        python3-cryptography
         qemu-img
         squashfs-tools
         systemd-udev
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
index 75276f7a9..0f48bf255 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
@@ -12,12 +12,10 @@ Packages=
         btrfs-progs
         erofs-utils
         grub-common
-        libarchive-tools
         libcryptsetup12
         libseccomp2
         libtss2-dev
         policycoreutils
-        python3-cryptography
         python3-pefile
         reprepro
         sbsigntool
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf
index 4b380e591..8dcdef1de 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf
@@ -10,11 +10,9 @@ Packages=
         createrepo_c
         distribution-gpg-keys
         erofs-utils
-        glibc-gconv-modules-extra
         libseccomp2
         pkcs11-provider
         policycoreutils
-        python3-cryptography
         python3-pefile
         sbsigntools
         squashfs
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/ubuntu.conf
index 20dd63c21..b0ca1c3ce 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/ubuntu.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/ubuntu.conf
@@ -8,4 +8,5 @@ Repositories=main,universe
 
 [Content]
 Packages=
+        python3-cryptography
         ubuntu-keyring
diff --git a/mkosi/resources/mkosi-tools/mkosi.profiles/package-manager/mkosi.conf.d/arch.conf b/mkosi/resources/mkosi-tools/mkosi.profiles/package-manager/mkosi.conf.d/arch.conf
index bebaf2b37..19c5f4370 100644
--- a/mkosi/resources/mkosi-tools/mkosi.profiles/package-manager/mkosi.conf.d/arch.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.profiles/package-manager/mkosi.conf.d/arch.conf
@@ -10,7 +10,6 @@ Packages=
         createrepo_c
         distribution-gpg-keys
         dnf
-        dpkg
         reprepro
         ubuntu-keyring
         zypper