From 485d66e034f94ea9078ccc0c61fbf2cf73351b85 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 3 Sep 2022 10:00:49 -0700
Subject: [PATCH] Beta 1.4: sync all other changes from nightly

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 fedora-beta.conf | 101 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 77 insertions(+), 24 deletions(-)

diff --git a/fedora-beta.conf b/fedora-beta.conf
index e3cabbb..03f42e1 100644
--- a/fedora-beta.conf
+++ b/fedora-beta.conf
@@ -63,7 +63,7 @@ gather_method = {
     }
 }
 gather_backend = 'dnf'
-gather_profiler = True
+gather_profiler = False
 check_deps = False
 greedy_method = 'build'
 
@@ -94,6 +94,9 @@ create_jigdo = False
 # CREATEISO
 iso_hfs_ppc64le_compatible = False
 
+# use xorrisofs to make isos
+createiso_use_xorrisofs = True
+
 # BUILDINSTALL
 buildinstall_method = 'lorax'
 buildinstall_skip = [
@@ -199,31 +202,81 @@ filter_modules = [
     }),
 ]
 
+# Note: If you change something here (affects Rawhide/Branched composes), also
+# submit the same change to the Bodhi config (affects updates for stable releases),
+# we want to keep them in sync:
+# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+#
 # format: {arch|*: [packages]}
 multilib_blacklist = {
-    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
-        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'php-devel', 'java-*', 'bash-devel',
-        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
-        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
-        'mp'
-    ],
+    '*': [
+        'bash-devel',
+        'dmraid-devel',
+        'ghc-*',
+        'httpd',
+        'httpd-devel',
+        'java-*',
+        'kdeutils-devel',
+        'kernel',
+        'kernel*debug*',
+        'kernel-PAE*',
+        'krb5-server',
+        'krb5-server-ldap',
+        'mkinitrd-devel',
+        'mod_*',
+        'mp',
+        'php*',
+        'php-devel',
+        'tomcat-native',
+        ],
 }
 
-
+# Note: If you change something here (affects Rawhide/Branched composes), also
+# submit the same change to the Bodhi config (affects updates for stable releases),
+# we want to keep them in sync:
+# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+#
 # format: {arch|*: [packages]}
 multilib_whitelist = {
-    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
-        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
-        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
-        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
-        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
-        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
-        'mariadb-connector-odbc', 'compiler-rt',
+    '*': [
+        '*-static',
+        'apitrace-libs',
+        'compiler-rt',
+        'dssi-vst-wine',
+        'fakechroot-libs',
+        'fakeroot-libs',
+        'glib-networking',
+        'glx-utils',
+        'ibus-gtk2',
+        'ibus-gtk3',
+        'ibus-libs',
+        'iptables',
+        'libflashsupport',
+        'libgnat',
+        'lmms-vst',
+        'mangohud',
+        'mariadb-connector-odbc',
+        'mesa-vdpau-drivers',
+        'mesa-vulkan-drivers',
+        'mysql-connector-odbc',
+        'nosync',
+        'nspluginwrapper',
         'nvidia-query-resource-opengl-lib',
-        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
-        'glib-networking', 'dssi-vst-wine', 'mangohud', 'vkBasalt', 'glx-utils'
-    ],
+        'p11-kit-trust',
+        'perl-libs',
+        'pipewire',
+        'postgresql-odbc',
+        'redhat-lsb',
+        'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux',
+        'syslinux-tftpboot',
+        'systemd-pam',
+        'valgrind',
+        'vkBasalt',
+        'wine',
+        'wine-*',
+        'yaboot',
+        ],
 }
 
 createiso_skip = [
@@ -313,7 +366,7 @@ translate_paths = [
 
 # These will be inherited by live_media, live_images and image_build
 global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37'
-global_release = '1.3'
+global_release = '1.4'
 global_version = '37_Beta'
 # live_images ignores this in favor of live_target
 global_target = 'f37'
@@ -451,7 +504,7 @@ image_build = {
                     'name': 'Fedora-Python-Classroom',
                     'kickstart': 'fedora-disk-python-classroom.ks',
                     'distro': 'Fedora-30',
-                    'disk_size': 12,
+                    'disk_size': 18,
                     'arches': ['aarch64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
@@ -530,7 +583,7 @@ image_build = {
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Workstation',
-                    'failable': [''],
+                    'failable': ['armhfp'],
                      }
         },
         ],
@@ -867,7 +920,7 @@ ostree_installer = [
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
                 "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f36",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f35",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'f37',
@@ -919,7 +972,7 @@ ostree_installer = [
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
                 "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f36",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f35",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'f37',