From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 10 Jul 2024 06:38:32 +0000 (+0200)
Subject: Modernize mkosi rpm build configuration
X-Git-Tag: v24~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=298a269684f4c2a6c5f4e133065ffe3f34f93124;p=thirdparty%2Fmkosi.git

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 431ab2c46..635a38b56 100644
--- 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 66de5d12a..8efdb00a7 100644
--- 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
index 19ce2d7dd..000000000
--- 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