From d8127b279936e0421e4ff177a8284cab7e9ac7f2 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Thu, 16 Mar 2023 17:37:04 +0100
Subject: [PATCH] Revert "Split the pungi_general.conf"

This reverts commit cc5fd0cc3ad7c1b5f825f615e40bc3b5865f1a3e.
---
 ...pungi_multilib.conf => pungi_general.conf} | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
 rename roles/bodhi2/backend/files/{pungi_multilib.conf => pungi_general.conf} (80%)

diff --git a/roles/bodhi2/backend/files/pungi_multilib.conf b/roles/bodhi2/backend/files/pungi_general.conf
similarity index 80%
rename from roles/bodhi2/backend/files/pungi_multilib.conf
rename to roles/bodhi2/backend/files/pungi_general.conf
index 13376b9078..c3a9d804bc 100644
--- a/roles/bodhi2/backend/files/pungi_multilib.conf
+++ b/roles/bodhi2/backend/files/pungi_general.conf
@@ -1,8 +1,26 @@
+# PRODUCT INFO
+release_name = '[[ release.id_prefix.title() ]]'
+release_short = '[[ release.id_prefix.title() ]]'
+release_is_layered = False
+
+hashed_directories = True
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+filter_system_release_packages = False
+
+# GATHER
+greedy_method = 'build'
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+
 # MULTILIB
 # Note: If you change something here (affects updates for stable releases), also
 # submit the same change to pungi-fedora (affects Rawhide/Branched composes),
 # we want to keep them in sync:
-# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+# https://pagure.io/pungi-fedora/blob/main/f/general.conf
 #
 # format: {arch|*: [packages]}
 multilib_blacklist = {
@@ -34,7 +52,7 @@ multilib_blacklist = {
 # Note: If you change something here (affects updates for stable releases), also
 # submit the same change to pungi-fedora (affects Rawhide/Branched composes),
 # we want to keep them in sync:
-# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+# https://pagure.io/pungi-fedora/blob/main/f/general.conf
 #
 # format: {arch|*: [packages]}
 multilib_whitelist = {