From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Dec 2019 16:05:56 +0000 (+0100)
Subject: mkosi: modernize
X-Git-Tag: v245-rc1~85^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64db6f3644c3f889eb4f961f5d7dfebce1fc37ef;p=thirdparty%2Fsystemd.git

mkosi: modernize

Fedora minimization had some effect, hence add some required
dependencies explicitly so that we work anyway.

Also, the libtool is not used anymore, drop it.

Finally, the mkosi output format is called gpt_ext4 now, not raw_ext4
anymore.
---

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 911908cb771..dbd9b4df99d 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -8,7 +8,7 @@ Distribution=fedora
 Release=31
 
 [Output]
-Format=raw_btrfs
+Format=gpt_ext4
 Bootable=yes
 KernelCommandLine=printk.devkmsg=on
 
@@ -38,19 +38,20 @@ BuildPackages=
         libblkid-devel
         libcap-devel
         libcurl-devel
+        libfdisk-devel
         libgcrypt-devel
         libidn2-devel
         libmicrohttpd-devel
         libmount-devel
         libseccomp-devel
         libselinux-devel
-        libtool
         libxkbcommon-devel
         libxslt
         lz4
         lz4-devel
         m4
         meson
+        openssl-devel
         pam-devel
         pcre2-devel
         pkgconfig
@@ -58,10 +59,17 @@ BuildPackages=
         python3-lxml
         qrencode-devel
         tree
+        valgrind-devel
         xz-devel
 
 Packages=
+        coreutils
+        cryptsetup-libs
+        kmod-libs
         libidn2
+        libseccomp
+        procps-ng
+        util-linux
 
 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache