Merge pull request #10919 from yuwata/sd-device-monitor-fixes

[thirdparty/systemd.git] / .mkosi / mkosi.fedora

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 00129a5af36b21ab728b8d59ccb7b232e25e0e8c..ff43ecdfe6b2785076b4f8695e2d89120f798b38 100644 (file)
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -1,30 +1,16 @@
-# This file is part of systemd.
-#
-# Copyright 2016 Lennart Poettering
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: LGPL-2.1+
 
 # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
 
 [Distribution]
 Distribution=fedora
-Release=26
+Release=29
 
 [Output]
 Format=raw_btrfs
 Bootable=yes
+KernelCommandLine=printk.devkmsg=on
 
 [Partitions]
 RootSize=3G
@@ -32,7 +18,6 @@ RootSize=3G
 [Packages]
 BuildPackages=
         audit-libs-devel
-        meson
         bzip2-devel
         cryptsetup-devel
         dbus-devel
@@ -40,12 +25,13 @@ BuildPackages=
         docbook-style-xsl
         elfutils-devel
         gcc
+        gettext
         git
         gnu-efi
         gnu-efi-devel
         gnutls-devel
         gperf
-        intltool
+        hostname
         iptables-devel
         kmod-devel
         libacl-devel
@@ -53,7 +39,7 @@ BuildPackages=
         libcap-devel
         libcurl-devel
         libgcrypt-devel
-        libidn-devel
+        libidn2-devel
         libmicrohttpd-devel
         libmount-devel
         libseccomp-devel
@@ -63,10 +49,19 @@ BuildPackages=
         libxslt
         lz4
         lz4-devel
+        m4
+        meson
         pam-devel
+        pcre2-devel
         pkgconfig
         python3-devel
         python3-lxml
         qrencode-devel
         tree
         xz-devel
+
+Packages=
+        libidn2
+
+BuildDirectory=mkosi.builddir
+Cache=mkosi.cache