]> git.ipfire.org Git - thirdparty/mkosi.git/commit
Use mkosi dependencies in default image 2839/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 5 Jul 2024 18:52:22 +0000 (20:52 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 6 Jul 2024 14:54:15 +0000 (16:54 +0200)
commitbcfaa035716ee0208b869d4f74ffcca55c498a59
treeb6098fabcbb4b8fa2cf712ac63bde785e8447bb3
parent5d9077d68a229be88f2254e0c953001cfe1af3d2
Use mkosi dependencies in default image

Let's reduce duplication by using mkosi dependencies to install
all required dependencies to build the default image. To make this
work we add support for tools trees on jammy/bookworm. We also drop
support for a focal default image as it's too much of a burden to
maintain.

We also remove the EPEL only packages from the CentOS tools tree so
that mkosi dependencies works on a CentOS Stream system without EPEL
enabled.

Finally, curl-minimal is replaced by curl because trying to install
curl-minimal on a system with curl leads to a dnf failure so we opt
for the larger curl in order to make mkosi dependencies useful in
more situations.
25 files changed:
mkosi.conf
mkosi.conf.d/20-arch.conf
mkosi.conf.d/20-centos.conf
mkosi.conf.d/20-fedora/mkosi.conf
mkosi.conf.d/20-fedora/mkosi.conf.d/20-uefi.conf [deleted file]
mkosi.conf.d/20-opensuse.conf
mkosi.conf.d/20-rhel-ubi.conf
mkosi.conf.d/30-centos-fedora/mkosi.conf
mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf
mkosi.conf.d/30-debian-ubuntu/mkosi.conf
mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf
mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf [deleted file]
mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
mkosi.prepare [new file with mode: 0755]
mkosi.prepare.chroot
mkosi/resources/mkosi-tools/mkosi.conf
mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos.conf [deleted file]
mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf [moved from mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf with 91% similarity]
mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/systemd-boot.conf [moved from mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-focal.conf with 55% similarity]
mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/ubuntu-keyring.conf [new file with mode: 0644]
mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/virtiofsd.conf [new file with mode: 0644]
mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf