From 02f6c13ecba89b3d8754ae37611e4f7f6cabedab Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 27 Jan 2025 15:05:45 +0100 Subject: [PATCH] mkosi-tools: Drop fish and zsh These are a bit too exquisite to have in the default tools tree and we don't start a shell in mkosi-sandbox by default anymore, so let's stick to just having bash in the default tools tree. --- mkosi/resources/mkosi-tools/mkosi.conf | 1 - mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf | 1 - .../mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf | 1 - .../mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf | 1 - .../mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf | 1 - mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf | 1 - mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf | 1 - 7 files changed, 7 deletions(-) diff --git a/mkosi/resources/mkosi-tools/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf index c0f03cedd..cd2f8bb0c 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf @@ -40,5 +40,4 @@ Packages= tar util-linux xfsprogs - zsh zstd diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf index 7ea74a958..5e999a4b6 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf @@ -16,7 +16,6 @@ Packages= dpkg edk2-ovmf erofs-utils - fish git grub libseccomp diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf index 388574838..bc3ba0f3d 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf @@ -8,4 +8,3 @@ Release=10 Packages= btrfs-progs distribution-gpg-keys - fish diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf index 85eba17d1..3c5c65f3c 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf @@ -11,7 +11,6 @@ Packages= btrfs-progs debian-keyring distribution-gpg-keys - fish pacman sbsigntools ubu-keyring diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf index 746054cd1..9c96f39e6 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf @@ -18,7 +18,6 @@ Packages= debian-archive-keyring dnf erofs-utils - fish git-core grub-common libarchive-tools diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf index 4c14ab6ef..4dd94a62a 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf @@ -13,7 +13,6 @@ Packages= dnf5 dnf5-plugins erofs-utils - fish pacman perf pkcs11-provider diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf index 8bd7fb253..a6d9d511d 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf @@ -12,7 +12,6 @@ Packages= dnf5 dnf5-plugins erofs-utils - fish git-core glibc-gconv-modules-extra grep -- 2.47.2