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 0db2539940767b2563c8554012fea016ecc198ed..cd9127200f387ab34fc9b57545b856e85addaffc 100644 (file)
--- 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 ad52ace98e688a00dc6e60bde3758e85a7470184..0301929a05c8b18419a1ea4ba04b521442e53a8c 100644 (file)
--- 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 0a5340a50bfbe06468933a919c7179ac09648df6..c1ad0ff4a6bb3c5bd48719a43e591b4eac6d4be0 100644 (file)
--- 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 75276f7a9cc19f3d9e4f0bb9374987ea74580517..0f48bf255748e76ce85177be0de18fcb1d2413bf 100644 (file)
--- 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 4b380e591e7737f5a2924a95630daa807479bad6..8dcdef1deebf644c853661241cc9de9b1d6d8ace 100644 (file)
--- 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 20dd63c21ccbf34b72c6475d50492aab9ff8fafa..b0ca1c3ced13a5a895299ae6ecf7ad919719edb3 100644 (file)
--- 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 bebaf2b37a471ea675de65f9ed407d6d29c10d5e..19c5f43700fdab9712457a119f43e1a8e2de3b6f 100644 (file)
--- 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