Modernize mkosi rpm build configuration

diff --git a/mkosi.conf.d/30-centos-fedora/mkosi.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf
index 431ab2c460492ab8a68de1b3c4e64491baee8aa0..635a38b56087d15aa56e9e0c784b332ab1d0221d 100644 (file)
--- a/mkosi.conf.d/30-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/30-centos-fedora/mkosi.conf
@@ -18,3 +18,4 @@ Packages=
         python3
         strace
         systemd-resolved
+        rpm-build

diff --git a/mkosi.conf.d/30-rpm/mkosi.conf b/mkosi.conf.d/30-rpm/mkosi.conf
index 66de5d12a234f8ba311757f6be1870d0ddf46abc..8efdb00a7d69516058f153ec89ff7eee9600f125 100644 (file)
--- a/mkosi.conf.d/30-rpm/mkosi.conf
+++ b/mkosi.conf.d/30-rpm/mkosi.conf
@@ -3,3 +3,8 @@
 [Match]
 BuildSources=rpm
 Distribution=fedora
+
+[Content]
+VolatilePackages=
+        mkosi
+        mkosi-initrd

diff --git a/mkosi.conf.d/30-rpm/mkosi.postinst b/mkosi.conf.d/30-rpm/mkosi.postinst
deleted file mode 100755 (executable)
index 19ce2d7..0000000
--- a/mkosi.conf.d/30-rpm/mkosi.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-mkosi-install mkosi mkosi-initrd