319 files changed, 2084 insertions, 5817 deletions

diff --git a/el10a.cfg b/el10a.cfg
new file mode 100644
index 0000000..9d3d747
--- /dev/null
+++ b/el10a.cfg
@@ -0,0 +1,5 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a'
+config_opts['resultdir'] = "/var/lib/mock/el10a"
+
diff --git a/el10a.tpl b/el10a.tpl
new file mode 100644
index 0000000..32f6e22
--- /dev/null
+++ b/el10a.tpl
@@ -0,0 +1,129 @@
+include('vendor.tpl')
+
+config_opts['target_arch'] = 'aarch64'
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy'
+config_opts['dist'] = 'el10'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '10'
+config_opts['package_manager'] = 'dnf'
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.el10x/"
+
+config_opts['basedir'] = '/dev/build/'
+config_opts['cleanup_on_success'] = True
+config_opts['cleanup_on_failure'] = False
+
+config_opts['createrepo_on_rpms'] = True
+config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+
+config_opts['macros']['%_topdir']="/builddir/build"
+config_opts['macros']['%_smp_mflags']="-j24"
+config_opts['macros']['%dist']=".el10.remi"
+config_opts['macros']['%rhel']="10"
+config_opts['macros']['%_with_ibase']="1"
+config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
+config_opts['macros']['%runselftest']="1"
+
+config_opts['environment']['ACCEPT_EULA'] = 'Y'
+
+#config_opts['module_enable'] = ['php:remi-8.3']
+
+config_opts['yum.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=90000
+fastestmirror=1
+max_parallel_downloads=6
+modules=1
+module_hotfixes=1
+module_platform_id=platform:el10
+
+# repos
+[rhel-10-baseos]
+name=rhel-10-baseos
+baseurl=file:/mnt/rhel-10-aarch64/BaseOS/
+enabled=1
+
+[rhel-10-appstream]
+name=rhel-10-appstream
+baseurl=file:/mnt/rhel-10-aarch64/AppStream/
+enabled=1
+## excludepkgs=php*
+
+[epel]
+name=epel-10.0
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-10.0&arch=aarch64
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-10.0&arch=aarch64
+baseurl=https://dl.fedoraproject.org/pub/epel/10.0/Everything/aarch64/
+enabled=1
+
+[epel-next]
+name=epel-10.1
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-10.1&arch=aarch64
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-10.1&arch=aarch64
+baseurl=https://dl.fedoraproject.org/pub/epel/10.1/Everything/aarch64/
+enabled=0
+
+[epel-testing]
+name=epel-10.0-testing
+mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel10.0&arch=aarch64
+enabled=0
+
+[remi]
+name=remi public
+baseurl=http://remi/repo/enterprise/10/remi/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-modular]
+name=remi modular
+baseurl=http://remi/repo/enterprise/10/modular/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv]
+name=remi private
+baseurl=file:/home/remi/priv/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-el10]
+name=remi private el10
+baseurl=file:/home/remi/priv/el10.aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-debuginfo]
+name=remi-debuginfo
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/10/debug-remi/x86_64/
+enabled=0
+
+[result-el10a]
+name=result-el10a
+baseurl=file:/var/lib/mock/el10a/
+metadata_expire=30
+skip_if_unavailable=True
+enabled=1
+
+[msprod]
+name=msprod
+baseurl=https://packages.microsoft.com/rhel/9/prod/
+enabled=0
+includepkgs=msodbcsql18
+
+[stream]
+name=CentOS 10 Stream
+baseurl=https://mirror.stream.centos.org/10-stream/AppStream/aarch64/os/
+enabled=0
+"""
diff --git a/el10a74.cfg b/el10a74.cfg
new file mode 100644
index 0000000..c514f03
--- /dev/null
+++ b/el10a74.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a74'
+config_opts['resultdir'] = "/var/lib/mock/el10a74"
+
+config_opts['module_enable']  = ['php:remi-7.4']
+#config_opts['module_install'] = ['php:remi-7.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-7.4"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10a74]
+name=result-el10a74
+baseurl=file:/var/lib/mock/el10a74/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10a80.cfg b/el10a80.cfg
new file mode 100644
index 0000000..73e2f70
--- /dev/null
+++ b/el10a80.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a80'
+config_opts['resultdir'] = "/var/lib/mock/el10a80"
+
+config_opts['module_enable']  = ['php:remi-8.0']
+config_opts['module_install'] = ['php:remi-8.0/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10a80]
+name=result-el10a80
+baseurl=file:/var/lib/mock/el10a80/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10a81.cfg b/el10a81.cfg
new file mode 100644
index 0000000..9995ae2
--- /dev/null
+++ b/el10a81.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a81'
+config_opts['resultdir'] = "/var/lib/mock/el10a81"
+
+config_opts['module_enable']  = ['php:remi-8.1']
+config_opts['module_install'] = ['php:remi-8.1/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.1"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10a81]
+name=result-el10a81
+baseurl=file:/var/lib/mock/el10a81/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10a82.cfg b/el10a82.cfg
new file mode 100644
index 0000000..230c07a
--- /dev/null
+++ b/el10a82.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a82'
+config_opts['resultdir'] = "/var/lib/mock/el10a82"
+
+config_opts['module_enable']  = ['php:remi-8.2']
+config_opts['module_install'] = ['php:remi-8.2/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.2"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10a82]
+name=result-el10a82
+baseurl=file:/var/lib/mock/el10a82/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10a83.cfg b/el10a83.cfg
new file mode 100644
index 0000000..918f050
--- /dev/null
+++ b/el10a83.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a83'
+config_opts['resultdir'] = "/var/lib/mock/el10a83"
+
+config_opts['module_enable']  = ['php:remi-8.3']
+config_opts['module_install'] = ['php:remi-8.3/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.3"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10a83]
+name=result-el10a83
+baseurl=file:/var/lib/mock/el10a83/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10a84.cfg b/el10a84.cfg
new file mode 100644
index 0000000..23f3154
--- /dev/null
+++ b/el10a84.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a84'
+config_opts['resultdir'] = "/var/lib/mock/el10a84"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10a84]
+name=result-el10a84
+baseurl=file:/var/lib/mock/el10a84/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/fc38xm.cfg b/el10am.cfg
index a448cd3..33ceeb8 100644
--- a/fc38xm.cfg
+++ b/el10am.cfg
@@ -1,15 +1,17 @@
 import datetime;
 
-include('fc38x.tpl')
+include('el10a.tpl')
 
-config_opts['root'] = 'fc38x'
-config_opts['resultdir'] = "/var/lib/mock/fc38x"
+config_opts['root'] = 'el10a'
+config_opts['resultdir'] = "/var/lib/mock/el10a"
+
+# config_opts['module_enable']  = ['memcached:remi']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="memcached"
 config_opts['macros']['%_module_stream']="remi"
-config_opts['macros']['%_module_version']="38" + nn;
+config_opts['macros']['%_module_version']="10000" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el10ar80.cfg b/el10ar80.cfg
new file mode 100644
index 0000000..fa8e96f
--- /dev/null
+++ b/el10ar80.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el10a.tpl')
+
+config_opts['root'] = 'el10a'
+config_opts['resultdir'] = "/var/lib/mock/el10a"
+
+# config_opts['module_enable'] = ['redis:remi-8.0']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el10ascl74.cfg b/el10ascl74.cfg
new file mode 100644
index 0000000..8af3f8c
--- /dev/null
+++ b/el10ascl74.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl74el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl74el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php74-build php74-php-devel php74-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl74el10a]
+name=result-scl74el10a
+baseurl=file:/var/lib/mock/scl74el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10ascl80.cfg b/el10ascl80.cfg
new file mode 100644
index 0000000..5866606
--- /dev/null
+++ b/el10ascl80.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl80el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl80el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php80-build php80-php-devel php80-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl80el10a]
+name=result-scl80el10a
+baseurl=file:/var/lib/mock/scl80el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10ascl81.cfg b/el10ascl81.cfg
new file mode 100644
index 0000000..4c142f5
--- /dev/null
+++ b/el10ascl81.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl81el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl81el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php81-build php81-php-devel php81-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl81el10a]
+name=result-scl81el10a
+baseurl=file:/var/lib/mock/scl81el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10ascl82.cfg b/el10ascl82.cfg
new file mode 100644
index 0000000..4f14852
--- /dev/null
+++ b/el10ascl82.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl82el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl82el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php82-build php82-php-devel php82-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl82el10a]
+name=result-scl82el10a
+baseurl=file:/var/lib/mock/scl82el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10ascl83.cfg b/el10ascl83.cfg
new file mode 100644
index 0000000..d67d415
--- /dev/null
+++ b/el10ascl83.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl83el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl83el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php83-build php83-php-devel php83-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl83el10a]
+name=result-scl83el10a
+baseurl=file:/var/lib/mock/scl83el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10ascl84.cfg b/el10ascl84.cfg
new file mode 100644
index 0000000..acfe2d8
--- /dev/null
+++ b/el10ascl84.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl84el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl84el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php84-build php84-php-devel php84-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl84el10a]
+name=result-scl84el10a
+baseurl=file:/var/lib/mock/scl84el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10ascl85.cfg b/el10ascl85.cfg
new file mode 100644
index 0000000..2af1bb4
--- /dev/null
+++ b/el10ascl85.cfg
@@ -0,0 +1,24 @@
+include('el10a.tpl')
+
+config_opts['root'] = 'scl85el10a'
+config_opts['resultdir'] = "/var/lib/mock/scl85el10a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php85-build php85-php-devel php85-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl85el10a]
+name=result-scl85el10a
+baseurl=file:/var/lib/mock/scl85el10a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10x.cfg b/el10x.cfg
new file mode 100644
index 0000000..9a93343
--- /dev/null
+++ b/el10x.cfg
@@ -0,0 +1,5 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x'
+config_opts['resultdir'] = "/var/lib/mock/el10x"
+
diff --git a/el10x.tpl b/el10x.tpl
new file mode 100644
index 0000000..199337f
--- /dev/null
+++ b/el10x.tpl
@@ -0,0 +1,129 @@
+include('vendor.tpl')
+
+config_opts['target_arch'] = 'x86_64'
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy'
+config_opts['dist'] = 'el10'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '10'
+config_opts['package_manager'] = 'dnf4'
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.el10x/"
+
+config_opts['basedir'] = '/dev/build/'
+config_opts['cleanup_on_success'] = True
+config_opts['cleanup_on_failure'] = False
+
+config_opts['createrepo_on_rpms'] = True
+config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+
+config_opts['macros']['%_topdir']="/builddir/build"
+config_opts['macros']['%_smp_mflags']="-j15"
+config_opts['macros']['%dist']=".el10.remi"
+config_opts['macros']['%rhel']="10"
+config_opts['macros']['%_with_ibase']="1"
+config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
+config_opts['macros']['%runselftest']="1"
+
+config_opts['environment']['ACCEPT_EULA'] = 'Y'
+
+#config_opts['module_enable'] = ['php:remi-8.3']
+
+config_opts['yum.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+metadata_expire=90000
+fastestmirror=1
+max_parallel_downloads=6
+modules=1
+module_hotfixes=1
+module_platform_id=platform:el10
+
+# repos
+[rhel-10-baseos]
+name=rhel-10-baseos
+baseurl=file:/mnt/rhel-10-x86_64/BaseOS/
+enabled=1
+
+[rhel-10-appstream]
+name=rhel-10-appstream
+baseurl=file:/mnt/rhel-10-x86_64/AppStream/
+enabled=1
+
+[epel]
+name=epel-10.0
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-10.0&arch=x86_64
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-10.0&arch=x86_64
+baseurl=https://dl.fedoraproject.org/pub/epel/10.0/Everything/x86_64/
+enabled=1
+
+[epel-next]
+name=epel-10.1
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-10.1&arch=x86_64
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-10.1&arch=x86_64
+baseurl=https://dl.fedoraproject.org/pub/epel/10.1/Everything/x86_64/
+enabled=0
+
+[epel-testing]
+name=epel-10.0-testing
+mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel10.0&arch=x86_64
+#baseurl=https://dl.fedoraproject.org/pub/epel/testing/10.0/Everything/x86_64/
+enabled=0
+
+[remi]
+name=remi public
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/10/remi/x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-modular]
+name=remi modular
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/10/modular/x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-priv]
+name=remi prive
+baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-el10]
+name=remi prive el10
+baseurl=file:/home/rpmbuild/site/rpms/priv/el10.x86_64/
+enabled=1
+metadata_expire=30
+
+[remi-debuginfo]
+name=remi-debuginfo
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/10/debug-remi/x86_64/
+enabled=0
+
+[result-el10x]
+name=result-el10x
+baseurl=file:/var/lib/mock/el10x/
+metadata_expire=30
+skip_if_unavailable=True
+enabled=1
+
+[msprod]
+name=msprod
+baseurl=https://packages.microsoft.com/rhel/9/prod/
+enabled=0
+includepkgs=msodbcsql18
+
+[stream]
+name=CentOS 10 Stream
+baseurl=https://mirror.stream.centos.org/10-stream/AppStream/x86_64/os/
+enabled=0
+"""
diff --git a/el10x74.cfg b/el10x74.cfg
new file mode 100644
index 0000000..085457d
--- /dev/null
+++ b/el10x74.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x74'
+config_opts['resultdir'] = "/var/lib/mock/el10x74"
+
+config_opts['module_enable']  = ['php:remi-7.4']
+config_opts['module_install'] = ['php:remi-7.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-7.4"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10x74]
+name=result-el10x74
+baseurl=file:/var/lib/mock/el10x74/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10x80.cfg b/el10x80.cfg
new file mode 100644
index 0000000..616bea1
--- /dev/null
+++ b/el10x80.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x80'
+config_opts['resultdir'] = "/var/lib/mock/el10x80"
+
+config_opts['module_enable']  = ['php:remi-8.0']
+config_opts['module_install'] = ['php:remi-8.0/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10x80]
+name=result-el10x80
+baseurl=file:/var/lib/mock/el10x80/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10x81.cfg b/el10x81.cfg
new file mode 100644
index 0000000..b76e025
--- /dev/null
+++ b/el10x81.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x81'
+config_opts['resultdir'] = "/var/lib/mock/el10x81"
+
+config_opts['module_enable']  = ['php:remi-8.1']
+config_opts['module_install'] = ['php:remi-8.1/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.1"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10x81]
+name=result-el10x81
+baseurl=file:/var/lib/mock/el10x81/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10x82.cfg b/el10x82.cfg
new file mode 100644
index 0000000..959e816
--- /dev/null
+++ b/el10x82.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x82'
+config_opts['resultdir'] = "/var/lib/mock/el10x82"
+
+config_opts['module_enable']  = ['php:remi-8.2']
+config_opts['module_install'] = ['php:remi-8.2/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.2"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10x82]
+name=result-el10x82
+baseurl=file:/var/lib/mock/el10x82/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10x83.cfg b/el10x83.cfg
new file mode 100644
index 0000000..e612444
--- /dev/null
+++ b/el10x83.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x83'
+config_opts['resultdir'] = "/var/lib/mock/el10x83"
+
+config_opts['module_enable']  = ['php:remi-8.3']
+config_opts['module_install'] = ['php:remi-8.3/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.3"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10x83]
+name=result-el10x83
+baseurl=file:/var/lib/mock/el10x83/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el10x84.cfg b/el10x84.cfg
new file mode 100644
index 0000000..72428c1
--- /dev/null
+++ b/el10x84.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x84'
+config_opts['resultdir'] = "/var/lib/mock/el10x84"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el10x84]
+name=result-el10x84
+baseurl=file:/var/lib/mock/el10x84/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/fc37xm.cfg b/el10xm.cfg
index 3e94811..7719e67 100644
--- a/fc37xm.cfg
+++ b/el10xm.cfg
@@ -1,15 +1,17 @@
 import datetime;
 
-include('fc37x.tpl')
+include('el10x.tpl')
 
-config_opts['root'] = 'fc37x'
-config_opts['resultdir'] = "/var/lib/mock/fc37x"
+config_opts['root'] = 'el10x'
+config_opts['resultdir'] = "/var/lib/mock/el10x"
+
+# config_opts['module_enable'] = ['memcached:remi']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="memcached"
 config_opts['macros']['%_module_stream']="remi"
-config_opts['macros']['%_module_version']="37" + nn;
+config_opts['macros']['%_module_version']="10000" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el10xr80.cfg b/el10xr80.cfg
new file mode 100644
index 0000000..85a4951
--- /dev/null
+++ b/el10xr80.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el10x.tpl')
+
+config_opts['root'] = 'el10x'
+config_opts['resultdir'] = "/var/lib/mock/el10x"
+
+# config_opts['module_enable'] = ['redis:remi-8.0']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="10000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el10xscl74.cfg b/el10xscl74.cfg
new file mode 100644
index 0000000..49a95c6
--- /dev/null
+++ b/el10xscl74.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl74el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl74el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php74-build php74-php-devel php74-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl74el10x]
+name=result-scl74el10x
+baseurl=file:/var/lib/mock/scl74el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10xscl80.cfg b/el10xscl80.cfg
new file mode 100644
index 0000000..d01ee41
--- /dev/null
+++ b/el10xscl80.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl80el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl80el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php80-build php80-php-devel php80-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl80el10x]
+name=result-scl80el10x
+baseurl=file:/var/lib/mock/scl80el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10xscl81.cfg b/el10xscl81.cfg
new file mode 100644
index 0000000..2f5a4a4
--- /dev/null
+++ b/el10xscl81.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl81el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl81el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php81-build php81-php-devel php81-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl81el10x]
+name=result-scl81el10x
+baseurl=file:/var/lib/mock/scl81el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10xscl82.cfg b/el10xscl82.cfg
new file mode 100644
index 0000000..270088b
--- /dev/null
+++ b/el10xscl82.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl82el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl82el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php82-build php82-php-devel php82-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl82el10x]
+name=result-scl82el10x
+baseurl=file:/var/lib/mock/scl82el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10xscl83.cfg b/el10xscl83.cfg
new file mode 100644
index 0000000..f99f615
--- /dev/null
+++ b/el10xscl83.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl83el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl83el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php83-build php83-php-devel php83-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl83el10x]
+name=result-scl83el10x
+baseurl=file:/var/lib/mock/scl83el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10xscl84.cfg b/el10xscl84.cfg
new file mode 100644
index 0000000..ccf1efe
--- /dev/null
+++ b/el10xscl84.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl84el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl84el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php84-build php84-php-devel php84-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl84el10x]
+name=result-scl84el10x
+baseurl=file:/var/lib/mock/scl84el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el10xscl85.cfg b/el10xscl85.cfg
new file mode 100644
index 0000000..4d3be89
--- /dev/null
+++ b/el10xscl85.cfg
@@ -0,0 +1,24 @@
+include('el10x.tpl')
+
+config_opts['root'] = 'scl85el10x'
+config_opts['resultdir'] = "/var/lib/mock/scl85el10x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php85-build php85-php-devel php85-php-pear'
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl85el10x]
+name=result-scl85el10x
+baseurl=file:/var/lib/mock/scl85el10x/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el7t55.cfg b/el7t55.cfg
deleted file mode 100644
index 7c05b17..0000000
--- a/el7t55.cfg
+++ /dev/null
@@ -1,126 +0,0 @@
-config_opts['root'] = 'el7x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain devtoolset-7-toolchain'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el7x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/el7x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el7.remi"
-config_opts['macros']['%rhel']="7"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:/mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=1
-
-[remi-php55]
-name=remi php55
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=1
-
-[remi-php56]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:/var/lib/mock/el7x/
-enabled=1
-
-
-"""
-
diff --git a/el7t56.cfg b/el7t56.cfg
deleted file mode 100644
index 4dd54fc..0000000
--- a/el7t56.cfg
+++ /dev/null
@@ -1,127 +0,0 @@
-config_opts['root'] = 'el7x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain devtoolset-7-toolchain'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el7x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/el7x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el7.remi"
-config_opts['macros']['%rhel']="7"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:/mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=1
-exclude=php-pecl*
-
-[remi-php55]
-name=remi php55
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:/var/lib/mock/el7x/
-enabled=1
-
-
-"""
-
diff --git a/el7x.cfg b/el7x.cfg
deleted file mode 100644
index e23f115..0000000
--- a/el7x.cfg
+++ /dev/null
@@ -1,128 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache devtoolset-6-toolchain devtoolset-7-toolchain devtoolset-8-toolchain'
-
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu6*-devel libicu7*-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/debug-remi/x86_64/
-enabled=1
-
-[remi-php74]
-name=remi php74
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php74/x86_64/
-enabled=0
-
-[remi-php80]
-name=remi php80
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php80/x86_64/
-enabled=0
-
-[remi-php81]
-name=remi php81
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php81/x86_64/
-enabled=0
-
-[remi-php82]
-name=remi php82
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php82/x86_64/
-enabled=0
-
-[remi-php83]
-name=remi php83
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php83/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-exclude=oracle*12.2* oracle*18* oracle*19* oracle*21*
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-tainted-7&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-7&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[resultel7x]
-name=resultel7x
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-
-"""
-
diff --git a/el7x.tpl b/el7x.tpl
deleted file mode 100644
index ed98db1..0000000
--- a/el7x.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'el7x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache devtoolset-6-toolchain devtoolset-7-toolchain devtoolset-8-toolchain devtoolset-10-toolchain'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/el7x"
-
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-#config_opts['package_manager'] = 'dnf'
-#config_opts['use_bootstrap'] = False
-
-config_opts['macros']['%_smp_mflags']="-j15"
-config_opts['macros']['%dist']=".el7.remi"
-config_opts['macros']['%rhel']="7"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
diff --git a/el7x54.cfg b/el7x54.cfg
deleted file mode 120000
index 869b8b9..0000000
--- a/el7x54.cfg
+++ /dev/null
@@ -1 +0,0 @@
-el7x.cfg
\ No newline at end of file
diff --git a/el7x55.cfg b/el7x55.cfg
deleted file mode 100644
index 902273a..0000000
--- a/el7x55.cfg
+++ /dev/null
@@ -1,112 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['root'] = 'el7x55'
-config_opts['resultdir'] = "/var/lib/mock/el7x55"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu6*-devel libicu7*-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php55]
-name=remi php55
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=1
-
-[remi-php56]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-exclude=oracle*12.2* oracle*18* oracle*19* oracle*21*
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result55]
-name=result
-baseurl=file:///var/lib/mock/el7x55/
-enabled=1
-
-"""
-
diff --git a/el7x56.cfg b/el7x56.cfg
deleted file mode 100644
index 04dae9a..0000000
--- a/el7x56.cfg
+++ /dev/null
@@ -1,111 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['root'] = 'el7x56'
-config_opts['resultdir'] = "/var/lib/mock/el7x56"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu62-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php55]
-name=remi php55
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result56]
-name=result
-baseurl=file:///var/lib/mock/el7x56/
-enabled=1
-
-"""
-
diff --git a/el7x70.cfg b/el7x70.cfg
deleted file mode 100644
index 754fd73..0000000
--- a/el7x70.cfg
+++ /dev/null
@@ -1,110 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'el7x70'
-config_opts['resultdir'] = "/var/lib/mock/el7x70"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros compat-libtidy-devel
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-* libicu62-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php70]
-name=remi php70
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php70/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-[result70]
-name=result
-baseurl=file:///var/lib/mock/el7x70/
-enabled=1
-
-"""
-
diff --git a/el7x71.cfg b/el7x71.cfg
deleted file mode 100644
index abbe985..0000000
--- a/el7x71.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="6"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-6-"
-
-config_opts['root'] = 'el7x71'
-config_opts['resultdir'] = "/var/lib/mock/el7x71"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php71]
-name=remi php71
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php71/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result71]
-name=result
-baseurl=file:///var/lib/mock/el7x71/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x72.cfg b/el7x72.cfg
deleted file mode 100644
index 36a8a8c..0000000
--- a/el7x72.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="6"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-6-"
-
-config_opts['root'] = 'el7x72'
-config_opts['resultdir'] = "/var/lib/mock/el7x72"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php72]
-name=remi php72
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php72/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result72]
-name=result
-baseurl=file:///var/lib/mock/el7x72/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x73.cfg b/el7x73.cfg
deleted file mode 100644
index e08ab61..0000000
--- a/el7x73.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="7"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-7/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-7-"
-
-config_opts['root'] = 'el7x73'
-config_opts['resultdir'] = "/var/lib/mock/el7x73"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php73]
-name=remi php73
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php73/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result73]
-name=result
-baseurl=file:///var/lib/mock/el7x73/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x74.cfg b/el7x74.cfg
deleted file mode 100644
index 392d42f..0000000
--- a/el7x74.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="8"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-8-"
-
-config_opts['root'] = 'el7x74'
-config_opts['resultdir'] = "/var/lib/mock/el7x74"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php74]
-name=remi php74
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php74/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result74]
-name=result
-baseurl=file:///var/lib/mock/el7x74/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x80.cfg b/el7x80.cfg
deleted file mode 100644
index 63909ff..0000000
--- a/el7x80.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="8"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-8-"
-
-config_opts['root'] = 'el7x80'
-config_opts['resultdir'] = "/var/lib/mock/el7x80"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php80]
-name=remi php80
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php80/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result80]
-name=result
-baseurl=file:///var/lib/mock/el7x80/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x81.cfg b/el7x81.cfg
deleted file mode 100644
index c65a96e..0000000
--- a/el7x81.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="10"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-10-"
-
-config_opts['root'] = 'el7x81'
-config_opts['resultdir'] = "/var/lib/mock/el7x81"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php81]
-name=remi php81
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php81/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result81]
-name=result
-baseurl=file:///var/lib/mock/el7x81/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x82.cfg b/el7x82.cfg
deleted file mode 100644
index 592908c..0000000
--- a/el7x82.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="10"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-10-"
-
-config_opts['root'] = 'el7x82'
-config_opts['resultdir'] = "/var/lib/mock/el7x82"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php82]
-name=remi php82
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php82/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result82]
-name=result
-baseurl=file:///var/lib/mock/el7x82/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7x83.cfg b/el7x83.cfg
deleted file mode 100644
index 29869af..0000000
--- a/el7x83.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%dtsversion']="10"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-10-"
-
-config_opts['root'] = 'el7x83'
-config_opts['resultdir'] = "/var/lib/mock/el7x83"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=php-pecl-*  libicu-last-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php83]
-name=remi php83
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php83/x86_64/
-enabled=1
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result83]
-name=result
-baseurl=file:///var/lib/mock/el7x83/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xr.cfg b/el7xr.cfg
deleted file mode 100644
index b84b31a..0000000
--- a/el7xr.cfg
+++ /dev/null
@@ -1,110 +0,0 @@
-include('el7x.tpl')
-
-config_opts['macros']['%_with_rpmfusion']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-#exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu6*-devel libicu7*-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/debug-remi/x86_64/
-enabled=1
-
-[remi-php55]
-name=remi php55
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-exclude=oracle*12.2* oracle*18* oracle*19* oracle*21*
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-tainted-7&arch=x86_64
-enabled=1
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-7&arch=x86_64
-enabled=1
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[resultel7x]
-name=resultel7x
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-
-"""
-
diff --git a/el7xscl54.cfg b/el7xscl54.cfg
deleted file mode 100644
index 1afcbb8..0000000
--- a/el7xscl54.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl54el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php54-build devtoolset-6-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl54el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu6*-devel libicu7*-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php55]
-name=remi php55
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-exclude=oracle*12.2* oracle*18* oracle*19* oracle*21*
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl54el7x]
-name=result
-baseurl=file:///var/lib/mock/scl54el7x/
-enabled=1
-
-
-"""
diff --git a/el7xscl55.cfg b/el7xscl55.cfg
deleted file mode 100644
index fa94fac..0000000
--- a/el7xscl55.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl55el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php55-build devtoolset-6-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl55el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu6*-devel libicu7*-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php55]
-name=remi php55
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-exclude=oracle*12.2* oracle*18* oracle*19* oracle*21*
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl55el7x]
-name=result
-baseurl=file:///var/lib/mock/scl55el7x/
-enabled=1
-
-
-"""
diff --git a/el7xscl56.cfg b/el7xscl56.cfg
deleted file mode 100644
index 71e8550..0000000
--- a/el7xscl56.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl56el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php56-build devtoolset-6-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl56el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu62-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-php55]
-name=remi php55
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl56el7x]
-name=result
-baseurl=file:///var/lib/mock/scl56el7x/
-enabled=1
-
-
-"""
-
diff --git a/el7xscl70.cfg b/el7xscl70.cfg
deleted file mode 100644
index 0bb5c70..0000000
--- a/el7xscl70.cfg
+++ /dev/null
@@ -1,110 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl70el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php70-build devtoolset-6-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl70el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-exclude=libicu62-devel
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl70el7x]
-name=result
-baseurl=file:///var/lib/mock/scl70el7x/
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl71.cfg b/el7xscl71.cfg
deleted file mode 100644
index 55a5ba4..0000000
--- a/el7xscl71.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl71el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php71-build devtoolset-6-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl71el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="6"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-6-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl71el7x]
-name=result
-baseurl=file:///var/lib/mock/scl71el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl72.cfg b/el7xscl72.cfg
deleted file mode 100644
index cf806cb..0000000
--- a/el7xscl72.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl72el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php72-build php72-php-devel php72-php-pear devtoolset-6-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl72el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="6"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-6-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl72el7x]
-name=result
-baseurl=file:///var/lib/mock/scl72el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl73.cfg b/el7xscl73.cfg
deleted file mode 100644
index 5a19a81..0000000
--- a/el7xscl73.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl73el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php73-build php73-php-devel php73-php-pear devtoolset-7-toolchain'
-config_opts['resultdir'] = "/var/lib/mock/scl73el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="7"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-7/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-7-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl73el7x]
-name=result
-baseurl=file:///var/lib/mock/scl73el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl74.cfg b/el7xscl74.cfg
deleted file mode 100644
index 050db86..0000000
--- a/el7xscl74.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl74el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-8-toolchain ccache php74-build php74-php-devel php74-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl74el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="8"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-8-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl74el7x]
-name=result
-baseurl=file:///var/lib/mock/scl74el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl80.cfg b/el7xscl80.cfg
deleted file mode 100644
index 098685a..0000000
--- a/el7xscl80.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl80el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-8-toolchain ccache php80-build php80-php-devel php80-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl80el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="8"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-8-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl80el7x]
-name=result
-baseurl=file:///var/lib/mock/scl80el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl81.cfg b/el7xscl81.cfg
deleted file mode 100644
index 11027c3..0000000
--- a/el7xscl81.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl81el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-10-toolchain ccache php81-build php81-php-devel php81-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl81el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="10"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-10-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl81el7x]
-name=result
-baseurl=file:///var/lib/mock/scl81el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl82.cfg b/el7xscl82.cfg
deleted file mode 100644
index be74afb..0000000
--- a/el7xscl82.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl82el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-10-toolchain ccache php82-build php82-php-devel php82-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl82el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="10"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-10-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl82el7x]
-name=result
-baseurl=file:///var/lib/mock/scl82el7x/
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xscl83.cfg b/el7xscl83.cfg
deleted file mode 100644
index 46334f9..0000000
--- a/el7xscl83.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-include('el7x.tpl')
-
-config_opts['root'] = 'scl83el7x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-10-toolchain ccache php83-build php83-php-devel php83-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl83el7x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%nophptag']="1"
-config_opts['macros']['%dtsversion']="10"
-config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable"
-config_opts['macros']['%dtsprefix']="devtoolset-10-"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:///mnt/rhel-7-x86_64/
-enabled=1
-exclude=libicu-devel
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-exclude=libicu-last-devel
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:///home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:///home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result-el7x]
-name=result
-baseurl=file:///var/lib/mock/el7x/
-enabled=1
-
-[result-scl83el7x]
-name=result
-baseurl=file:///var/lib/mock/scl83el7x/
-enabled=1
-skip_if_unavailable=True
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
-enabled=0
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
-
diff --git a/el7xt.cfg b/el7xt.cfg
deleted file mode 100644
index 176c90a..0000000
--- a/el7xt.cfg
+++ /dev/null
@@ -1,126 +0,0 @@
-config_opts['root'] = 'el7x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el7x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/el7x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el7.remi"
-config_opts['macros']['%rhel']="7"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[rhel-7]
-name=rhel-7
-baseurl=file:/mnt/rhel-7-x86_64/
-enabled=1
-
-[rc]
-name=rc
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/
-enabled=0
-
-[rc-optional]
-name=rc-optional
-baseurl=http://ftp.redhat.com/redhat/rhel/rc/7/Server-optional/x86_64/os/
-enabled=0
-
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=0
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=0
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
-enabled=1
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/test/x86_64/
-enabled=1
-
-[remi-php55]
-name=remi php55
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php55/x86_64/
-enabled=0
-
-[remi-php56]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/php56/x86_64/
-enabled=0
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/el7.x86_64/
-enabled=1
-
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-6&arch=x86_64
-enabled=0
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-el-updates-released-6&arch=x86_64
-enabled=0
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[result]
-name=result
-baseurl=file:/var/lib/mock/el7x/
-enabled=1
-
-
-"""
-
diff --git a/el8a.tpl b/el8a.tpl
index b98e997..4cba3de 100644
--- a/el8a.tpl
+++ b/el8a.tpl
@@ -2,7 +2,7 @@ include('vendor.tpl')
 
 config_opts['target_arch'] = 'aarch64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
@@ -10,9 +10,9 @@ config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8a/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.el8a/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
@@ -89,9 +89,16 @@ metadata_expire=30
 
 [remi-priv]
 name=remi private
+baseurl=file:/home/remi/priv/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-el8]
+name=remi private el8
 baseurl=file:/home/remi/priv/el8.aarch64/
 enabled=1
 metadata_expire=30
+module_hotfixes=1
 
 [remi-debuginfo]
 name=remi-debuginfo
diff --git a/el8ar80.cfg b/el8ar80.cfg
new file mode 100644
index 0000000..5371393
--- /dev/null
+++ b/el8ar80.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el8a.tpl')
+
+config_opts['root'] = 'el8a'
+config_opts['resultdir'] = "/var/lib/mock/el8a"
+
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="81000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el8ascl72.cfg b/el8ascl72.cfg
index bbf96f0..a2eee09 100644
--- a/el8ascl72.cfg
+++ b/el8ascl72.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl72el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl73.cfg b/el8ascl73.cfg
index 5834a79..330a707 100644
--- a/el8ascl73.cfg
+++ b/el8ascl73.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl73el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl73el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl74.cfg b/el8ascl74.cfg
index e101c80..3f246a1 100644
--- a/el8ascl74.cfg
+++ b/el8ascl74.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl74el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl74el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl80.cfg b/el8ascl80.cfg
index ec500a3..0ac9b6c 100644
--- a/el8ascl80.cfg
+++ b/el8ascl80.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl80el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl80el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl81.cfg b/el8ascl81.cfg
index 27f514e..347ffa4 100644
--- a/el8ascl81.cfg
+++ b/el8ascl81.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl81el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl81el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php81-build php81-php-devel php81-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php81-build php81-php-devel php81-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl82.cfg b/el8ascl82.cfg
index a8d185b..2befbd0 100644
--- a/el8ascl82.cfg
+++ b/el8ascl82.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl82el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl82el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php82-build php82-php-devel php82-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php82-build php82-php-devel php82-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl83.cfg b/el8ascl83.cfg
index c3f300b..cc9701d 100644
--- a/el8ascl83.cfg
+++ b/el8ascl83.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl83el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl83el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php83-build php83-php-devel php83-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php83-build php83-php-devel php83-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl84.cfg b/el8ascl84.cfg
index 2498025..fb81e9b 100644
--- a/el8ascl84.cfg
+++ b/el8ascl84.cfg
@@ -2,7 +2,7 @@ include('el8a.tpl')
 
 config_opts['root'] = 'scl84el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl84el8a"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php84-build php84-php-devel php84-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php84-build php84-php-devel php84-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8ascl85.cfg b/el8ascl85.cfg
new file mode 100644
index 0000000..de9b4cc
--- /dev/null
+++ b/el8ascl85.cfg
@@ -0,0 +1,26 @@
+include('el8a.tpl')
+
+config_opts['root'] = 'scl85el8a'
+config_opts['resultdir'] = "/var/lib/mock/scl85el8a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php85-build php85-php-devel php85-php-pear'
+
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl85el8a]
+name=result-scl85el8a
+baseurl=file:/var/lib/mock/scl85el8a/
+metadata_expire=30
+enabled=1
+skip_if_unavailable=True
+
+"""
diff --git a/el8n83.cfg b/el8n83.cfg
new file mode 100644
index 0000000..4ceebee
--- /dev/null
+++ b/el8n83.cfg
@@ -0,0 +1,9 @@
+# build noarch package using PHP 8.3
+
+include('el8x.tpl')
+
+config_opts['root'] = 'el8x83'
+config_opts['resultdir'] = "/var/lib/mock/el8x"
+
+config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.3', 'redis:remi-7.2']
+
diff --git a/el8x.tpl b/el8x.tpl
index 1633cb1..ecc5d57 100644
--- a/el8x.tpl
+++ b/el8x.tpl
@@ -2,17 +2,17 @@ include('vendor.tpl')
 
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['chroot_setup_cmd'] = 'install platform-python bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
+config_opts['package_manager'] = 'dnf4'
 
 config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.el8x/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
@@ -97,6 +97,7 @@ name=remi prive el8
 baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
 enabled=1
 metadata_expire=30
+module_hotfixes=1
 
 [remi-debuginfo]
 name=remi-debuginfo
@@ -108,6 +109,7 @@ name=result-el8x
 baseurl=file:/var/lib/mock/el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 [msprod]
 name=msprod
diff --git a/el8x72.cfg b/el8x72.cfg
index 81500c2..d6044b0 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -22,5 +22,6 @@ baseurl=file:/var/lib/mock/el8x72/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el8x73.cfg b/el8x73.cfg
index d16f11d..f70023f 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -22,5 +22,6 @@ baseurl=file:/var/lib/mock/el8x73/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el8x74.cfg b/el8x74.cfg
index eb5829d..537d83e 100644
--- a/el8x74.cfg
+++ b/el8x74.cfg
@@ -23,5 +23,6 @@ baseurl=file:/var/lib/mock/el8x74/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el8x80.cfg b/el8x80.cfg
index 317cafc..f3d19d0 100644
--- a/el8x80.cfg
+++ b/el8x80.cfg
@@ -23,5 +23,6 @@ baseurl=file:/var/lib/mock/el8x80/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el8x81.cfg b/el8x81.cfg
index 580e12d..7880d83 100644
--- a/el8x81.cfg
+++ b/el8x81.cfg
@@ -23,5 +23,6 @@ baseurl=file:/var/lib/mock/el8x81/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xp.cfg b/el8xp.cfg
deleted file mode 100644
index 6dc4ff6..0000000
--- a/el8xp.cfg
+++ /dev/null
@@ -1,129 +0,0 @@
-config_opts['root'] = 'el8x'
-config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '8'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el8x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/el8x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el8.remi"
-config_opts['macros']['%rhel']="8"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-6.0']
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-modules=1
-module_hotfixes=1
-module_platform_id=platform:el8
-
-# repos
-[rhel-8-baseos]
-name=rhel-8-baseos
-baseurl=file:/mnt/rhel-8-x86_64/BaseOS/
-enabled=1
-
-[rhel-8-appstream]
-name=rhel-8-appstream
-baseurl=file:/mnt/rhel-8-x86_64/AppStream/
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[epel-playground]
-name=epel
-mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=playground-epel8&arch=x86_64
-exclude=epel-rpm-macros
-enabled=1
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/remi/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/modular/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-priv-el8]
-name=remi prive el8
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
-enabled=1
-metadata_expire=30
-
-[remi-bootstrap]
-name=remi bootstrap
-baseurl=file:/home/rpmbuild/site/rpms/priv/el8.noarch/
-enabled=1
-metadata_expire=30
-
-[remi-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/debug-remi/x86_64/
-enabled=1
-
-[result-el8x]
-name=result-el8x
-baseurl=file:/var/lib/mock/el8x/
-metadata_expire=30
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/8/prod/
-enabled=0
-includepkgs=msodbcsql17
-
-"""
diff --git a/el8xr80.cfg b/el8xr80.cfg
new file mode 100644
index 0000000..21de98f
--- /dev/null
+++ b/el8xr80.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el8x.tpl')
+
+config_opts['root'] = 'el8x'
+config_opts['resultdir'] = "/var/lib/mock/el8x"
+
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="81000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el8xscl56.cfg b/el8xscl56.cfg
index 5c52b86..9578615 100644
--- a/el8xscl56.cfg
+++ b/el8xscl56.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl56el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl56el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -22,5 +22,6 @@ name=result-scl56el8x
 baseurl=file:/var/lib/mock/scl56el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl70.cfg b/el8xscl70.cfg
index 03e2bb9..5413129 100644
--- a/el8xscl70.cfg
+++ b/el8xscl70.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl70el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl70el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl70el8x
 baseurl=file:/var/lib/mock/scl70el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl71.cfg b/el8xscl71.cfg
index 8fd0ac5..971690f 100644
--- a/el8xscl71.cfg
+++ b/el8xscl71.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl71el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl71el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php71-build'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php71-build'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl71el8x
 baseurl=file:/var/lib/mock/scl71el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl72.cfg b/el8xscl72.cfg
index 31caf9b..4a0dde7 100644
--- a/el8xscl72.cfg
+++ b/el8xscl72.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl72el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl72el8x
 baseurl=file:/var/lib/mock/scl72el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl73.cfg b/el8xscl73.cfg
index d61e5e0..f970814 100644
--- a/el8xscl73.cfg
+++ b/el8xscl73.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl73el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl73el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl73el8x
 baseurl=file:/var/lib/mock/scl73el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl74.cfg b/el8xscl74.cfg
index 67d8ac8..dda88ed 100644
--- a/el8xscl74.cfg
+++ b/el8xscl74.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl74el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl74el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl74el8x
 baseurl=file:/var/lib/mock/scl74el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl80.cfg b/el8xscl80.cfg
index 1d071ae..7cd1a3f 100644
--- a/el8xscl80.cfg
+++ b/el8xscl80.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl80el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl80el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl80el8x
 baseurl=file:/var/lib/mock/scl80el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl81.cfg b/el8xscl81.cfg
index aa5cedc..3462c12 100644
--- a/el8xscl81.cfg
+++ b/el8xscl81.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl81el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl81el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php81-build php81-php-devel php81-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php81-build php81-php-devel php81-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl81el8x
 baseurl=file:/var/lib/mock/scl81el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl82.cfg b/el8xscl82.cfg
index f131d19..79c138f 100644
--- a/el8xscl82.cfg
+++ b/el8xscl82.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl82el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl82el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php82-build php82-php-devel php82-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php82-build php82-php-devel php82-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
@@ -21,5 +21,6 @@ name=result-scl82el8x
 baseurl=file:/var/lib/mock/scl82el8x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el8xscl83.cfg b/el8xscl83.cfg
index db9acb4..2e6e43d 100644
--- a/el8xscl83.cfg
+++ b/el8xscl83.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl83el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl83el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php83-build php83-php-devel php83-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php83-build php83-php-devel php83-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8xscl84.cfg b/el8xscl84.cfg
index 8cb8934..80a19b7 100644
--- a/el8xscl84.cfg
+++ b/el8xscl84.cfg
@@ -2,7 +2,7 @@ include('el8x.tpl')
 
 config_opts['root'] = 'scl84el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl84el8x"
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php84-build php84-php-devel php84-php-pear'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php84-build php84-php-devel php84-php-pear'
 
 config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
diff --git a/el8xscl85.cfg b/el8xscl85.cfg
new file mode 100644
index 0000000..9cc2dbb
--- /dev/null
+++ b/el8xscl85.cfg
@@ -0,0 +1,26 @@
+include('el8x.tpl')
+
+config_opts['root'] = 'scl85el8x'
+config_opts['resultdir'] = "/var/lib/mock/scl85el8x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php85-build php85-php-devel php85-php-pear'
+
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl85el8x]
+name=result-scl85el8x
+baseurl=file:/var/lib/mock/scl85el8x/
+metadata_expire=30
+enabled=1
+skip_if_unavailable=True
+
+"""
diff --git a/el9a.tpl b/el9a.tpl
index 5c91578..befc296 100644
--- a/el9a.tpl
+++ b/el9a.tpl
@@ -10,9 +10,9 @@ config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el9x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.el9x/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
@@ -59,7 +59,7 @@ enabled=1
 name=rhel-9-appstream
 baseurl=file:/mnt/rhel-9-aarch64/AppStream/
 enabled=1
-excludepkgs=php*
+## excludepkgs=php*
 
 [epel]
 name=epel
@@ -88,7 +88,13 @@ enabled=1
 metadata_expire=30
 
 [remi-priv]
-name=remi prive
+name=remi private
+baseurl=file:/home/remi/priv/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-el9]
+name=remi private el9
 baseurl=file:/home/remi/priv/el9.aarch64/
 enabled=1
 metadata_expire=30
diff --git a/el9a74.cfg b/el9a74.cfg
index 336129c..a9bb1e6 100644
--- a/el9a74.cfg
+++ b/el9a74.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-7.4"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9a80.cfg b/el9a80.cfg
index 182ccfe..aaa88b0 100644
--- a/el9a80.cfg
+++ b/el9a80.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.0"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9a81.cfg b/el9a81.cfg
index 0e90ddd..945f650 100644
--- a/el9a81.cfg
+++ b/el9a81.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.1"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9a82.cfg b/el9a82.cfg
index 4120b05..7200284 100644
--- a/el9a82.cfg
+++ b/el9a82.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.2"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9a83.cfg b/el9a83.cfg
index 46102c8..45a2045 100644
--- a/el9a83.cfg
+++ b/el9a83.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.3"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9a84.cfg b/el9a84.cfg
index a093eb4..a5792d2 100644
--- a/el9a84.cfg
+++ b/el9a84.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.4"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9am.cfg b/el9am.cfg
index 4d86a41..9cd2796 100644
--- a/el9am.cfg
+++ b/el9am.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="memcached"
 config_opts['macros']['%_module_stream']="remi"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9ar60.cfg b/el9ar60.cfg
index 1ee5d13..bbb3675 100644
--- a/el9ar60.cfg
+++ b/el9ar60.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-6.0"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9ar62.cfg b/el9ar62.cfg
index 079f3f2..52bd18e 100644
--- a/el9ar62.cfg
+++ b/el9ar62.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-6.2"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9ar70.cfg b/el9ar70.cfg
index 42a4b74..3ee5ad8 100644
--- a/el9ar70.cfg
+++ b/el9ar70.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-7.0"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9ar72.cfg b/el9ar72.cfg
index f0f407b..8a8ebf3 100644
--- a/el9ar72.cfg
+++ b/el9ar72.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-7.2"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9ar80.cfg b/el9ar80.cfg
new file mode 100644
index 0000000..02adec4
--- /dev/null
+++ b/el9ar80.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el9a.tpl')
+
+config_opts['root'] = 'el9a'
+config_opts['resultdir'] = "/var/lib/mock/el9a"
+
+# config_opts['module_enable'] = ['redis:remi-8.0']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="90600" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el9ascl85.cfg b/el9ascl85.cfg
new file mode 100644
index 0000000..478e91e
--- /dev/null
+++ b/el9ascl85.cfg
@@ -0,0 +1,26 @@
+include('el9a.tpl')
+
+config_opts['root'] = 'scl85el9a'
+config_opts['resultdir'] = "/var/lib/mock/scl85el9a"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php85-build php85-php-devel php85-php-pear'
+
+config_opts['module_enable'] = ['redis:remi-7.2']
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl85el9a]
+name=result-scl85el9a
+baseurl=file:/var/lib/mock/scl85el9a/
+skip_if_unavailable=True
+metadata_expire=30
+enabled=1
+
+"""
diff --git a/el9n83.cfg b/el9n83.cfg
new file mode 100644
index 0000000..2a9cfb9
--- /dev/null
+++ b/el9n83.cfg
@@ -0,0 +1,9 @@
+# build noarch package using PHP 8.3
+
+include('el9x.tpl')
+
+config_opts['root'] = 'el9x83'
+config_opts['resultdir'] = "/var/lib/mock/el9x"
+
+config_opts['module_enable'] = ['php:remi-8.3']
+
diff --git a/el9x.tpl b/el9x.tpl
index fffa3b6..ef40500 100644
--- a/el9x.tpl
+++ b/el9x.tpl
@@ -6,13 +6,13 @@ config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils r
 config_opts['dist'] = 'el9'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '9'
-config_opts['package_manager'] = 'dnf'
+config_opts['package_manager'] = 'dnf4'
 
 config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el9x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.el9x/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
@@ -62,8 +62,8 @@ enabled=1
 [epel]
 name=epel
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=x86_64
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=x86_64
-#baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=x86_64
+baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/
 exclude=epel-rpm-macros
 enabled=1
 
@@ -107,6 +107,7 @@ name=result-el9x
 baseurl=file:/var/lib/mock/el9x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 [msprod]
 name=msprod
diff --git a/el9x74.cfg b/el9x74.cfg
index ca8f64b..00e23de 100644
--- a/el9x74.cfg
+++ b/el9x74.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-7.4"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
@@ -23,5 +23,6 @@ baseurl=file:/var/lib/mock/el9x74/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el9x80.cfg b/el9x80.cfg
index f0014e5..3d3de11 100644
--- a/el9x80.cfg
+++ b/el9x80.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.0"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
@@ -29,5 +29,6 @@ baseurl=file:/var/lib/mock/el9x80/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el9x81.cfg b/el9x81.cfg
index 49ad9ea..f40f61d 100644
--- a/el9x81.cfg
+++ b/el9x81.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.1"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
@@ -29,5 +29,6 @@ baseurl=file:/var/lib/mock/el9x81/
 metadata_expire=15
 enabled=1
 module_hotfixes=1
+skip_if_unavailable=True
 
 """
diff --git a/el9x82.cfg b/el9x82.cfg
index 38deab8..5f34fd9 100644
--- a/el9x82.cfg
+++ b/el9x82.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.2"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9x83.cfg b/el9x83.cfg
index 0bce530..589d4cf 100644
--- a/el9x83.cfg
+++ b/el9x83.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.3"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9x84.cfg b/el9x84.cfg
index 1e53824..3961015 100644
--- a/el9x84.cfg
+++ b/el9x84.cfg
@@ -12,7 +12,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.4"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9xm.cfg b/el9xm.cfg
index a9b937e..b4eb400 100644
--- a/el9xm.cfg
+++ b/el9xm.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="memcached"
 config_opts['macros']['%_module_stream']="remi"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9xr60.cfg b/el9xr60.cfg
index dafc9ae..485a027 100644
--- a/el9xr60.cfg
+++ b/el9xr60.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-6.0"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9xr62.cfg b/el9xr62.cfg
index ce6e604..7c9d593 100644
--- a/el9xr62.cfg
+++ b/el9xr62.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-6.2"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9xr70.cfg b/el9xr70.cfg
index f5a5695..1893ece 100644
--- a/el9xr70.cfg
+++ b/el9xr70.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-7.0"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9xr72.cfg b/el9xr72.cfg
index 27fc3fb..2cfbbc9 100644
--- a/el9xr72.cfg
+++ b/el9xr72.cfg
@@ -11,7 +11,7 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
 config_opts['macros']['%_module_stream']="remi-7.2"
-config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_version']="90600" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/el9xr80.cfg b/el9xr80.cfg
new file mode 100644
index 0000000..c99fdc9
--- /dev/null
+++ b/el9xr80.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el9x.tpl')
+
+config_opts['root'] = 'el9x'
+config_opts['resultdir'] = "/var/lib/mock/el9x"
+
+# config_opts['module_enable'] = ['redis:remi-8.0']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="90600" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el9xscl74.cfg b/el9xscl74.cfg
index d6b98df..b817d0c 100644
--- a/el9xscl74.cfg
+++ b/el9xscl74.cfg
@@ -21,5 +21,6 @@ name=result-scl74el9x
 baseurl=file:/var/lib/mock/scl74el9x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el9xscl80.cfg b/el9xscl80.cfg
index 111d871..fb5af42 100644
--- a/el9xscl80.cfg
+++ b/el9xscl80.cfg
@@ -21,5 +21,6 @@ name=result-scl80el9x
 baseurl=file:/var/lib/mock/scl80el9x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el9xscl81.cfg b/el9xscl81.cfg
index 58cb88a..71113bd 100644
--- a/el9xscl81.cfg
+++ b/el9xscl81.cfg
@@ -21,5 +21,6 @@ name=result-scl81el9x
 baseurl=file:/var/lib/mock/scl81el9x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el9xscl82.cfg b/el9xscl82.cfg
index aac086c..2384857 100644
--- a/el9xscl82.cfg
+++ b/el9xscl82.cfg
@@ -21,5 +21,6 @@ name=result-scl82el9x
 baseurl=file:/var/lib/mock/scl82el9x/
 metadata_expire=30
 enabled=1
+skip_if_unavailable=True
 
 """
diff --git a/el9xscl85.cfg b/el9xscl85.cfg
new file mode 100644
index 0000000..96e5d88
--- /dev/null
+++ b/el9xscl85.cfg
@@ -0,0 +1,26 @@
+include('el9x.tpl')
+
+config_opts['root'] = 'scl85el9x'
+config_opts['resultdir'] = "/var/lib/mock/scl85el9x"
+config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php85-build php85-php-devel php85-php-pear'
+
+config_opts['module_enable'] = ['redis:remi-7.2']
+
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+
+[result-scl85el9x]
+name=result-scl85el9x
+baseurl=file:/var/lib/mock/scl85el9x/
+metadata_expire=30
+enabled=1
+skip_if_unavailable=True
+
+"""
diff --git a/fc34i.cfg b/fc34i.cfg
deleted file mode 100644
index 1f6ab17..0000000
--- a/fc34i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-include('fc34i.tpl')
-
diff --git a/fc34i.tpl b/fc34i.tpl
deleted file mode 100644
index fc1109b..0000000
--- a/fc34i.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'fc34i'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'install @build ccache gcc'
-config_opts['dist'] = 'fc34'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '34'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc34i/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc34i"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%dist']=".fc34.remi"
-config_opts['macros']['%fedora']="34"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[koji]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/f34-build/latest/i386/
-cost=2000
-enabled=1
-skip_if_unavailable=False
-
-[result-fc34i]
-name=result-fc34i
-baseurl=file:/var/lib/mock/fc34i/
-metadata_expire=10
-enabled=1
-
-"""
diff --git a/fc34x.cfg b/fc34x.cfg
deleted file mode 100644
index 95ab95d..0000000
--- a/fc34x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('fc34x.tpl')
-
-# Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear'
-
diff --git a/fc34x.tpl b/fc34x.tpl
deleted file mode 100644
index b02e0b3..0000000
--- a/fc34x.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'fc34x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache gcc'
-config_opts['dist'] = 'fc34'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '34'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc34x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc34x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%dist']=".fc34.remi"
-config_opts['macros']['%fedora']="34"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-34&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/34/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/34/Everything/x86_64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/os/
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f34&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/34/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/34/x86_64/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f34&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/34/remi/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/34/debug-remi/x86_64/
-enabled=1
-
-[result-fc34x]
-name=result-fc34x
-baseurl=file:/var/lib/mock/fc34x/
-metadata_expire=10
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-
-"""
diff --git a/fc34x80.cfg b/fc34x80.cfg
deleted file mode 100644
index eab6b4a..0000000
--- a/fc34x80.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'fc34x80'
-config_opts['resultdir'] = "/var/lib/mock/fc34x80"
-
-config_opts['yum.conf'] += """
-[remi-php80]
-name=remi php80
-baseurl=file:/home/rpmbuild/site/rpms/fedora/34/php80/x86_64/
-enabled=1
-metadata_expire=1
-
-[result-fc34x80]
-name=result-fc34x80
-baseurl=file:/var/lib/mock/fc34x80/
-metadata_expire=10
-enabled=1
-
-"""
-
diff --git a/fc34x81.cfg b/fc34x81.cfg
deleted file mode 100644
index c6ea921..0000000
--- a/fc34x81.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'fc34x81'
-config_opts['resultdir'] = "/var/lib/mock/fc34x81"
-
-config_opts['yum.conf'] += """
-[remi-php81]
-name=remi php81
-baseurl=file:/home/rpmbuild/site/rpms/fedora/34/php81/x86_64/
-enabled=1
-metadata_expire=1
-
-[result-fc34x81]
-name=result-fc34x81
-baseurl=file:/var/lib/mock/fc34x81/
-metadata_expire=10
-enabled=1
-
-"""
-
diff --git a/fc34xr.cfg b/fc34xr.cfg
deleted file mode 100644
index 803bf4c..0000000
--- a/fc34xr.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['macros']['%_with_rpmfusion']="1"
-
-config_opts['yum.conf'] += """
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-34&arch=x86_64
-enabled=1
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-34&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-34&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-34&arch=x86_64
-enabled=0
-
-"""
diff --git a/fc34xscl56.cfg b/fc34xscl56.cfg
deleted file mode 100644
index ad6935c..0000000
--- a/fc34xscl56.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl56fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php56-build php56-php-devel php56-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl56fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['yum.conf'] += """
-[result-scl56fc34x]
-name=result-scl56fc34x
-baseurl=file:/var/lib/mock/scl56fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl70.cfg b/fc34xscl70.cfg
deleted file mode 100644
index 9257cb5..0000000
--- a/fc34xscl70.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl70fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php70-build php70-php-devel php70-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl70fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl70fc34x]
-name=result-scl70fc34x
-baseurl=file:///var/lib/mock/scl70fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl71.cfg b/fc34xscl71.cfg
deleted file mode 100644
index 8dea422..0000000
--- a/fc34xscl71.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl71fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php71-build php71-php-devel php71-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl71fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl71fc34x]
-name=result-scl71fc34x
-baseurl=file:///var/lib/mock/scl71fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl72.cfg b/fc34xscl72.cfg
deleted file mode 100644
index cef622e..0000000
--- a/fc34xscl72.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl72fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php72-build php72-php-devel php72-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl72fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl72fc34x]
-name=result-scl72fc34x
-baseurl=file:///var/lib/mock/scl72fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl73.cfg b/fc34xscl73.cfg
deleted file mode 100644
index 4ac1ac3..0000000
--- a/fc34xscl73.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl73fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php73-build php73-php-devel php73-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl73fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl73fc34x]
-name=result-scl73fc34x
-baseurl=file:///var/lib/mock/scl73fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl74.cfg b/fc34xscl74.cfg
deleted file mode 100644
index 47df915..0000000
--- a/fc34xscl74.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl74fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl74fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl74fc34x]
-name=result-scl74fc34x
-baseurl=file:///var/lib/mock/scl74fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl80.cfg b/fc34xscl80.cfg
deleted file mode 100644
index c750c0b..0000000
--- a/fc34xscl80.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl80fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl80fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl80fc34x]
-name=result-scl80fc34x
-baseurl=file:///var/lib/mock/scl80fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc34xscl81.cfg b/fc34xscl81.cfg
deleted file mode 100644
index 3fc63f1..0000000
--- a/fc34xscl81.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc34x.tpl')
-
-config_opts['root'] = 'scl81fc34x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl81fc34x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl81fc34x]
-name=result-scl81fc34x
-baseurl=file:///var/lib/mock/scl81fc34x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35i.cfg b/fc35i.cfg
deleted file mode 100644
index 9c6e680..0000000
--- a/fc35i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-include('fc35i.tpl')
-
diff --git a/fc35i.tpl b/fc35i.tpl
deleted file mode 100644
index 239ae6b..0000000
--- a/fc35i.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'fc35i'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'install @build ccache gcc'
-config_opts['dist'] = 'fc35'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '35'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc35i/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc35i"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%dist']=".fc35.remi"
-config_opts['macros']['%fedora']="35"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[koji]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/f35-build/latest/i386/
-cost=2000
-enabled=1
-skip_if_unavailable=False
-
-[result-fc35i]
-name=result-fc35i
-baseurl=file:/var/lib/mock/fc35i/
-metadata_expire=10
-enabled=1
-
-"""
diff --git a/fc35n81.cfg b/fc35n81.cfg
deleted file mode 100644
index 57a2505..0000000
--- a/fc35n81.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-# build noarch package using PHP 8.1
-
-include('fc35x.tpl')
-
-config_opts['root'] = 'fc35x81'
-config_opts['resultdir'] = "/var/lib/mock/fc35x"
-
-config_opts['yum.conf'] += """
-[remi-php81]
-name=remi php81
-baseurl=file:/home/rpmbuild/site/rpms/fedora/35/php81/x86_64/
-enabled=1
-metadata_expire=1
-
-[result-fc35x]
-name=result-fc35x
-baseurl=file:/var/lib/mock/fc35x/
-metadata_expire=10
-enabled=1
-
-"""
-
diff --git a/fc35x.cfg b/fc35x.cfg
deleted file mode 100644
index b0a06de..0000000
--- a/fc35x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('fc35x.tpl')
-
-# Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear'
-
diff --git a/fc35x.tpl b/fc35x.tpl
deleted file mode 100644
index 5e6f5be..0000000
--- a/fc35x.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'fc35x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc'
-config_opts['dist'] = 'fc35'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '35'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc35x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc35x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%dist']=".fc35.remi"
-config_opts['macros']['%fedora']="35"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-35&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/35/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/35/Everything/x86_64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/35/Everything/x86_64/os/
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f35&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/35/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/35/x86_64/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f35&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/35/Everything/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/35/remi/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/35/debug-remi/x86_64/
-enabled=1
-
-[result-fc35x]
-name=result-fc35x
-baseurl=file:/var/lib/mock/fc35x/
-metadata_expire=10
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=0
-
-"""
diff --git a/fc35x74.cfg b/fc35x74.cfg
deleted file mode 100644
index dd805f9..0000000
--- a/fc35x74.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'fc35x74'
-config_opts['resultdir'] = "/var/lib/mock/fc35x74"
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc ccache php-devel php-pear'
-
-config_opts['yum.conf'] += """
-[remi-php74]
-name=remi php74
-baseurl=file:/home/rpmbuild/site/rpms/fedora/35/php74/x86_64/
-enabled=1
-metadata_expire=1
-priority=2
-
-[result-fc35x74]
-name=result-fc35x74
-baseurl=file:/var/lib/mock/fc35x74/
-metadata_expire=10
-enabled=1
-priority=1
-
-"""
-
diff --git a/fc35x81.cfg b/fc35x81.cfg
deleted file mode 100644
index 72c7e49..0000000
--- a/fc35x81.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'fc35x81'
-config_opts['resultdir'] = "/var/lib/mock/fc35x81"
-
-config_opts['yum.conf'] += """
-[remi-php81]
-name=remi php81
-baseurl=file:/home/rpmbuild/site/rpms/fedora/35/php81/x86_64/
-enabled=1
-metadata_expire=1
-
-[result-fc35x81]
-name=result-fc35x81
-baseurl=file:/var/lib/mock/fc35x81/
-metadata_expire=10
-enabled=1
-
-"""
-
diff --git a/fc35x82.cfg b/fc35x82.cfg
deleted file mode 100644
index 589fa07..0000000
--- a/fc35x82.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc ccache php-devel php-pear'
-config_opts['root'] = 'fc35x82'
-config_opts['resultdir'] = "/var/lib/mock/fc35x82"
-
-config_opts['yum.conf'] += """
-[remi-php82]
-name=remi php82
-baseurl=file:/home/rpmbuild/site/rpms/fedora/35/php82/x86_64/
-enabled=1
-metadata_expire=1
-
-[result-fc35x82]
-name=result-fc35x82
-baseurl=file:/var/lib/mock/fc35x82/
-metadata_expire=10
-enabled=1
-skip_if_unavailable=True
-
-"""
-
diff --git a/fc35xr.cfg b/fc35xr.cfg
deleted file mode 100644
index c21d30a..0000000
--- a/fc35xr.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['macros']['%_with_rpmfusion']="1"
-
-config_opts['yum.conf'] += """
-[rpmfusion-free]
-name=rpmfusion-free
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-35&arch=x86_64
-enabled=1
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-35&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-35&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-35&arch=x86_64
-enabled=0
-
-"""
diff --git a/fc35xscl56.cfg b/fc35xscl56.cfg
deleted file mode 100644
index 9da4514..0000000
--- a/fc35xscl56.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl56fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php56-build php56-php-devel php56-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl56fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-config_opts['macros']['%_without_apcu']="1"
-
-config_opts['yum.conf'] += """
-[result-scl56fc35x]
-name=result-scl56fc35x
-baseurl=file:/var/lib/mock/scl56fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl70.cfg b/fc35xscl70.cfg
deleted file mode 100644
index 8364648..0000000
--- a/fc35xscl70.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl70fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php70-build php70-php-devel php70-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl70fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl70fc35x]
-name=result-scl70fc35x
-baseurl=file:///var/lib/mock/scl70fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl71.cfg b/fc35xscl71.cfg
deleted file mode 100644
index ebd743c..0000000
--- a/fc35xscl71.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl71fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php71-build php71-php-devel php71-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl71fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl71fc35x]
-name=result-scl71fc35x
-baseurl=file:///var/lib/mock/scl71fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl72.cfg b/fc35xscl72.cfg
deleted file mode 100644
index 5d3bb28..0000000
--- a/fc35xscl72.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl72fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php72-build php72-php-devel php72-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl72fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl72fc35x]
-name=result-scl72fc35x
-baseurl=file:///var/lib/mock/scl72fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl73.cfg b/fc35xscl73.cfg
deleted file mode 100644
index bd30aa5..0000000
--- a/fc35xscl73.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl73fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php73-build php73-php-devel php73-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl73fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl73fc35x]
-name=result-scl73fc35x
-baseurl=file:///var/lib/mock/scl73fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl74.cfg b/fc35xscl74.cfg
deleted file mode 100644
index b7a78b0..0000000
--- a/fc35xscl74.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl74fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl74fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl74fc35x]
-name=result-scl74fc35x
-baseurl=file:///var/lib/mock/scl74fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl80.cfg b/fc35xscl80.cfg
deleted file mode 100644
index f461905..0000000
--- a/fc35xscl80.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl80fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl80fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl80fc35x]
-name=result-scl80fc35x
-baseurl=file:///var/lib/mock/scl80fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl81.cfg b/fc35xscl81.cfg
deleted file mode 100644
index 19182ed..0000000
--- a/fc35xscl81.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl81fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl81fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl81fc35x]
-name=result-scl81fc35x
-baseurl=file:///var/lib/mock/scl81fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc35xscl82.cfg b/fc35xscl82.cfg
deleted file mode 100644
index 8ca2c4f..0000000
--- a/fc35xscl82.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc35x.tpl')
-
-config_opts['root'] = 'scl82fc35x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl82fc35x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl82fc35x]
-name=result-scl82fc35x
-baseurl=file:///var/lib/mock/scl82fc35x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc36x.cfg b/fc36x.cfg
deleted file mode 100644
index eb64eee..0000000
--- a/fc36x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('fc36x.tpl')
-
-# Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-
diff --git a/fc36x.tpl b/fc36x.tpl
deleted file mode 100644
index 439c161..0000000
--- a/fc36x.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'fc36x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc'
-config_opts['dist'] = 'fc36'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '36'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc36x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc36x"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%dist']=".fc36.remi"
-config_opts['macros']['%fedora']="36"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['module_enable'] = ['redis:remi-7.0']
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[fedora]
-name=fedora
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-36&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/36/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/36/Everything/x86_64/os/
-baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/x86_64/os/
-
-[updates]
-name=updates
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f36&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/36/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/36/x86_64/
-baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/updates/36/Everything/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f36&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/updates/testing/36/Everything/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/remi/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-modular]
-name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/modular/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
-enabled=1
-metadata_expire=10
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/debug-remi/x86_64/
-enabled=1
-
-[result-fc36x]
-name=result-fc36x
-baseurl=file:/var/lib/mock/fc36x/
-metadata_expire=10
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/8/prod/
-enabled=0
-
-"""
diff --git a/fc36x74.cfg b/fc36x74.cfg
deleted file mode 100644
index ee9ce42..0000000
--- a/fc36x74.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-import datetime;
-
-include('fc36x.tpl')
-
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear'
-config_opts['root'] = 'fc36x74'
-config_opts['resultdir'] = "/var/lib/mock/fc36x74"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="php"
-config_opts['macros']['%_module_stream']="remi-7.4"
-config_opts['macros']['%_module_version']="36" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
-config_opts['yum.conf'] += """
-[remi-php74]
-name=remi php74
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/php74/x86_64/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=2
-
-[result-fc36x74]
-name=result-fc36x74
-baseurl=file:/var/lib/mock/fc36x74/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=1
-
-"""
-
diff --git a/fc36x80.cfg b/fc36x80.cfg
deleted file mode 100644
index 7e42fe2..0000000
--- a/fc36x80.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-import datetime;
-
-include('fc36x.tpl')
-
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build php-devel php-pear'
-config_opts['root'] = 'fc36x80'
-config_opts['resultdir'] = "/var/lib/mock/fc36x80"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="php"
-config_opts['macros']['%_module_stream']="remi-8.0"
-config_opts['macros']['%_module_version']="36" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
-config_opts['yum.conf'] += """
-[remi-php80]
-name=remi php80
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/php80/x86_64/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=2
-
-[result-fc36x80]
-name=result-fc36x80
-baseurl=file:/var/lib/mock/fc36x80/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=1
-
-"""
-
diff --git a/fc36x81.cfg b/fc36x81.cfg
deleted file mode 100644
index abae70d..0000000
--- a/fc36x81.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-import datetime;
-
-include('fc36x.tpl')
-
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear'
-config_opts['root'] = 'fc36x81'
-config_opts['resultdir'] = "/var/lib/mock/fc36x81"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="php"
-config_opts['macros']['%_module_stream']="remi-8.1"
-config_opts['macros']['%_module_version']="36" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
-config_opts['yum.conf'] += """
-[remi-php81]
-name=remi php81
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/php81/x86_64/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=2
-
-[debug-php81]
-name=debug php81
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/debug-php81/x86_64/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=2
-
-[result-fc36x81]
-name=result-fc36x81
-baseurl=file:/var/lib/mock/fc36x81/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=1
-
-"""
-
diff --git a/fc36x82.cfg b/fc36x82.cfg
deleted file mode 100644
index ad936f3..0000000
--- a/fc36x82.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-import datetime;
-
-include('fc36x.tpl')
-
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear'
-config_opts['root'] = 'fc36x82'
-config_opts['resultdir'] = "/var/lib/mock/fc36x82"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="php"
-config_opts['macros']['%_module_stream']="remi-8.2"
-config_opts['macros']['%_module_version']="36" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
-config_opts['yum.conf'] += """
-[remi-php82]
-name=remi php82
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/php82/x86_64/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=2
-
-[debug-php82]
-name=debug php82
-baseurl=file:/home/rpmbuild/site/rpms/fedora/36/debug-php82/x86_64/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=2
-
-[result-fc36x82]
-name=result-fc36x82
-baseurl=file:/var/lib/mock/fc36x82/
-enabled=1
-metadata_expire=1
-module_hotfixes=1
-priority=1
-skip_if_unavailable=True
-
-"""
-
diff --git a/fc36xm.cfg b/fc36xm.cfg
deleted file mode 100644
index fa64f56..0000000
--- a/fc36xm.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc36x.tpl')
-
-config_opts['root'] = 'fc36x'
-config_opts['resultdir'] = "/var/lib/mock/fc36x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="memcached"
-config_opts['macros']['%_module_stream']="remi"
-config_opts['macros']['%_module_version']="36" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc36xr.cfg b/fc36xr.cfg
deleted file mode 100644
index def7b22..0000000
--- a/fc36xr.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-include('fc36x.tpl')
-
-config_opts['macros']['%_with_rpmfusion']="1"
-
-config_opts['yum.conf'] += """
-[rpmfusion-free]
-name=rpmfusion-free
-#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-36&arch=x86_64
-baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/x86_64/os/
-enabled=1
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-36&arch=x86_64
-baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/x86_64/
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-36&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-36&arch=x86_64
-enabled=0
-
-"""
diff --git a/fc36xscl74.cfg b/fc36xscl74.cfg
deleted file mode 100644
index 0225cfd..0000000
--- a/fc36xscl74.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc36x.tpl')
-
-config_opts['root'] = 'scl74fc36x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl74fc36x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl74fc36x]
-name=result-scl74fc36x
-baseurl=file:///var/lib/mock/scl74fc36x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc36xscl80.cfg b/fc36xscl80.cfg
deleted file mode 100644
index b4928bf..0000000
--- a/fc36xscl80.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc36x.tpl')
-
-config_opts['root'] = 'scl80fc36x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl80fc36x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl80fc36x]
-name=result-scl80fc36x
-baseurl=file:///var/lib/mock/scl80fc36x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc36xscl81.cfg b/fc36xscl81.cfg
deleted file mode 100644
index cd90cfe..0000000
--- a/fc36xscl81.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc36x.tpl')
-
-config_opts['root'] = 'scl81fc36x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl81fc36x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl81fc36x]
-name=result-scl81fc36x
-baseurl=file:///var/lib/mock/scl81fc36x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc36xscl82.cfg b/fc36xscl82.cfg
deleted file mode 100644
index 640d6a1..0000000
--- a/fc36xscl82.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-include('fc36x.tpl')
-
-config_opts['root'] = 'scl82fc36x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl82fc36x"
-
-config_opts['macros']['%scl_vendor']="remi"
-config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl82fc36x]
-name=result-scl82fc36x
-baseurl=file:///var/lib/mock/scl82fc36x/
-enabled=1
-metadata_expire=10
-
-"""
diff --git a/fc37x.cfg b/fc37x.cfg
deleted file mode 100644
index 07224af..0000000
--- a/fc37x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('fc37x.tpl')
-
-# Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-
diff --git a/fc37xr.cfg b/fc37xr.cfg
deleted file mode 100644
index e324a6e..0000000
--- a/fc37xr.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-include('fc37x.tpl')
-
-config_opts['macros']['%_with_rpmfusion']="1"
-
-config_opts['yum.conf'] += """
-[rpmfusion-free]
-name=rpmfusion-free
-#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-37&arch=x86_64
-baseurl=http://download1.rpmfusion.org/free/fedora/releases/37/Everything/x86_64/os/
-enabled=1
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-37&arch=x86_64
-baseurl=http://download1.rpmfusion.org/free/fedora/updates/37/x86_64/
-enabled=1
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-37&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-37&arch=x86_64
-enabled=0
-
-"""
diff --git a/fc37xr60.cfg b/fc37xr60.cfg
deleted file mode 100644
index c31e68f..0000000
--- a/fc37xr60.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc37x.tpl')
-
-config_opts['root'] = 'fc37x'
-config_opts['resultdir'] = "/var/lib/mock/fc37x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-6.0"
-config_opts['macros']['%_module_version']="37" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc37xr62.cfg b/fc37xr62.cfg
deleted file mode 100644
index 45aa0b5..0000000
--- a/fc37xr62.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc37x.tpl')
-
-config_opts['root'] = 'fc37x'
-config_opts['resultdir'] = "/var/lib/mock/fc37x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-6.2"
-config_opts['macros']['%_module_version']="37" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc37xr70.cfg b/fc37xr70.cfg
deleted file mode 100644
index 9faba42..0000000
--- a/fc37xr70.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc37x.tpl')
-
-config_opts['root'] = 'fc37x'
-config_opts['resultdir'] = "/var/lib/mock/fc37x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-7.0"
-config_opts['macros']['%_module_version']="37" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc37xr72.cfg b/fc37xr72.cfg
deleted file mode 100644
index 714b978..0000000
--- a/fc37xr72.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc37x.tpl')
-
-config_opts['root'] = 'fc37x'
-config_opts['resultdir'] = "/var/lib/mock/fc37x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-7.2"
-config_opts['macros']['%_module_version']="37" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc37xscl74.cfg b/fc37xscl74.cfg
deleted file mode 100644
index 30e3fb8..0000000
--- a/fc37xscl74.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc37x.tpl')
-
-config_opts['root'] = 'scl74fc37x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl74fc37x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl74/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl74fc37x]
-name=result-scl74fc37x
-baseurl=file:///var/lib/mock/scl74fc37x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc37xscl80.cfg b/fc37xscl80.cfg
deleted file mode 100644
index 0c8154b..0000000
--- a/fc37xscl80.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc37x.tpl')
-
-config_opts['root'] = 'scl80fc37x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl80fc37x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl80/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl80fc37x]
-name=result-scl80fc37x
-baseurl=file:///var/lib/mock/scl80fc37x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc37xscl81.cfg b/fc37xscl81.cfg
deleted file mode 100644
index 15cd1d4..0000000
--- a/fc37xscl81.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc37x.tpl')
-
-config_opts['root'] = 'scl81fc37x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl81fc37x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl81/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl81fc37x]
-name=result-scl81fc37x
-baseurl=file:///var/lib/mock/scl81fc37x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc37xscl82.cfg b/fc37xscl82.cfg
deleted file mode 100644
index ba990e2..0000000
--- a/fc37xscl82.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc37x.tpl')
-
-config_opts['root'] = 'scl82fc37x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl82fc37x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl82/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl82fc37x]
-name=result-scl82fc37x
-baseurl=file:///var/lib/mock/scl82fc37x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc38i.cfg b/fc38i.cfg
deleted file mode 100644
index ca350b1..0000000
--- a/fc38i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-include('fc38i.tpl')
-
diff --git a/fc38i.tpl b/fc38i.tpl
deleted file mode 100644
index f40f15d..0000000
--- a/fc38i.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-include('vendor.tpl')
-
-config_opts['root'] = 'fc38i'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'install @build ccache gcc'
-config_opts['dist'] = 'fc38'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '38'
-config_opts['package_manager'] = 'dnf'
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38i/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc38i"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%dist']=".fc38.remi"
-config_opts['macros']['%fedora']="38"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['environment']['ACCEPT_EULA'] = 'Y'
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-metadata_expire=80000
-fastestmirror=1
-max_parallel_downloads=6
-
-# repos
-
-[koji]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/f38-build/latest/i386/
-cost=2000
-enabled=1
-skip_if_unavailable=False
-
-[result-fc38i]
-name=result-fc38i
-baseurl=file:/var/lib/mock/fc38i/
-metadata_expire=10
-enabled=1
-skip_if_unavailable=True
-
-"""
diff --git a/fc38xr.cfg b/fc38xr.cfg
deleted file mode 100644
index 447b3b7..0000000
--- a/fc38xr.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-include('fc38x.tpl')
-
-config_opts['macros']['%_with_rpmfusion']="1"
-
-config_opts['yum.conf'] += """
-[rpmfusion-free]
-name=rpmfusion-free
-#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-38&arch=x86_64
-baseurl=http://download1.rpmfusion.org/free/fedora/development/38/Everything/x86_64/os/
-enabled=1
-
-[rpmfusion-free-updates]
-name=rpmfusion-free-updates
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-38&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-38&arch=x86_64
-enabled=0
-
-[rpmfusion-nonfree-updates]
-name=rpmfusion-nonfree
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-38&arch=x86_64
-enabled=0
-
-"""
diff --git a/fc38xr60.cfg b/fc38xr60.cfg
deleted file mode 100644
index e709dc8..0000000
--- a/fc38xr60.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc38x.tpl')
-
-config_opts['root'] = 'fc38x'
-config_opts['resultdir'] = "/var/lib/mock/fc38x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-6.0"
-config_opts['macros']['%_module_version']="38" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc38xr62.cfg b/fc38xr62.cfg
deleted file mode 100644
index 797afcd..0000000
--- a/fc38xr62.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc38x.tpl')
-
-config_opts['root'] = 'fc38x'
-config_opts['resultdir'] = "/var/lib/mock/fc38x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-6.2"
-config_opts['macros']['%_module_version']="38" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc38xr70.cfg b/fc38xr70.cfg
deleted file mode 100644
index 54145ff..0000000
--- a/fc38xr70.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc38x.tpl')
-
-config_opts['root'] = 'fc38x'
-config_opts['resultdir'] = "/var/lib/mock/fc38x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-7.0"
-config_opts['macros']['%_module_version']="38" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc38xr72.cfg b/fc38xr72.cfg
deleted file mode 100644
index 8c08e47..0000000
--- a/fc38xr72.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-import datetime;
-
-include('fc38x.tpl')
-
-config_opts['root'] = 'fc38x'
-config_opts['resultdir'] = "/var/lib/mock/fc38x"
-
-nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
-config_opts['macros']['%_module_build']="1"
-config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-7.2"
-config_opts['macros']['%_module_version']="38" + nn;
-config_opts['macros']['%_module_context']="00000000"
-config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
-
diff --git a/fc38xscl74.cfg b/fc38xscl74.cfg
deleted file mode 100644
index b9ef402..0000000
--- a/fc38xscl74.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc38x.tpl')
-
-config_opts['root'] = 'scl74fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl74fc38x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl74/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484380
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl74fc38x]
-name=result-scl74fc38x
-baseurl=file:///var/lib/mock/scl74fc38x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc38xscl80.cfg b/fc38xscl80.cfg
deleted file mode 100644
index 4fb0c94..0000000
--- a/fc38xscl80.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc38x.tpl')
-
-config_opts['root'] = 'scl80fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl80fc38x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl80/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484380
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl80fc38x]
-name=result-scl80fc38x
-baseurl=file:///var/lib/mock/scl80fc38x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc38xscl81.cfg b/fc38xscl81.cfg
deleted file mode 100644
index ad9f547..0000000
--- a/fc38xscl81.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc38x.tpl')
-
-config_opts['root'] = 'scl81fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl81fc38x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl81/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484380
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl81fc38x]
-name=result-scl81fc38x
-baseurl=file:///var/lib/mock/scl81fc38x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc38xscl82.cfg b/fc38xscl82.cfg
deleted file mode 100644
index c827f70..0000000
--- a/fc38xscl82.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-include('fc38x.tpl')
-
-config_opts['root'] = 'scl82fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl82fc38x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl82/"
-
-# Only needed to build main SCL package
-#config_opts['macros']['%scl_vendor']="remi"
-#config_opts['macros']['%_scl_prefix']="/opt/remi"
-
-config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484380
-#config_opts['macros']['%_debugsource_packages']="%nil"
-# workaround for https://bugzilla.redhat.com/1485310
-config_opts['macros']['%_build_id_links']='none'
-
-config_opts['yum.conf'] += """
-[result-scl82fc38x]
-name=result-scl82fc38x
-baseurl=file:///var/lib/mock/scl82fc38x/
-enabled=1
-metadata_expire=10
-skip_if_unavailable=True
-
-"""
diff --git a/fc39a.tpl b/fc39a.tpl
index 9e9cf75..a4e2067 100644
--- a/fc39a.tpl
+++ b/fc39a.tpl
@@ -10,9 +10,9 @@ config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['resultdir'] = "/var/lib/mock/fc39a"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
diff --git a/fc39a74.cfg b/fc39a74.cfg
index ff318e0..3eee8f9 100644
--- a/fc39a74.cfg
+++ b/fc39a74.cfg
@@ -5,7 +5,7 @@ include('fc39a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
 config_opts['root'] = 'fc39a74'
 config_opts['resultdir'] = "/var/lib/mock/fc39a74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
diff --git a/fc39a80.cfg b/fc39a80.cfg
index 2fa43cb..932334a 100644
--- a/fc39a80.cfg
+++ b/fc39a80.cfg
@@ -5,7 +5,7 @@ include('fc39a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
 config_opts['root'] = 'fc39a80'
 config_opts['resultdir'] = "/var/lib/mock/fc39a80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
diff --git a/fc39a81.cfg b/fc39a81.cfg
index fceeadd..157a675 100644
--- a/fc39a81.cfg
+++ b/fc39a81.cfg
@@ -5,7 +5,7 @@ include('fc39a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
 config_opts['root'] = 'fc39a81'
 config_opts['resultdir'] = "/var/lib/mock/fc39a81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
diff --git a/fc39a82.cfg b/fc39a82.cfg
index 3df74fe..ba39fdd 100644
--- a/fc39a82.cfg
+++ b/fc39a82.cfg
@@ -5,7 +5,7 @@ include('fc39a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
 config_opts['root'] = 'fc39a82'
 config_opts['resultdir'] = "/var/lib/mock/fc39a82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
diff --git a/fc39a83.cfg b/fc39a83.cfg
index d73dd81..367495c 100644
--- a/fc39a83.cfg
+++ b/fc39a83.cfg
@@ -5,7 +5,7 @@ include('fc39a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
 config_opts['root'] = 'fc39a83'
 config_opts['resultdir'] = "/var/lib/mock/fc39a83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
diff --git a/fc39a84.cfg b/fc39a84.cfg
index 69d1ceb..b2d329c 100644
--- a/fc39a84.cfg
+++ b/fc39a84.cfg
@@ -5,7 +5,7 @@ include('fc39a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
 config_opts['root'] = 'fc39a84'
 config_opts['resultdir'] = "/var/lib/mock/fc39a84"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39a84/"
 
 config_opts['module_enable']  = ['php:remi-8.4']
 config_opts['module_install'] = ['php:remi-8.4/devel']
diff --git a/fc36xr62.cfg b/fc39ar80.cfg
index 2f437d3..2588100 100644
--- a/fc36xr62.cfg
+++ b/fc39ar80.cfg
@@ -1,15 +1,15 @@
 import datetime;
 
-include('fc36x.tpl')
+include('fc39a.tpl')
 
-config_opts['root'] = 'fc36x'
-config_opts['resultdir'] = "/var/lib/mock/fc36x"
+config_opts['root'] = 'fc39a'
+config_opts['resultdir'] = "/var/lib/mock/fc39a"
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-6.2"
-config_opts['macros']['%_module_version']="36" + nn;
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="39" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/fc39ascl74.cfg b/fc39ascl74.cfg
index 1e3d9cd..a8fc7c7 100644
--- a/fc39ascl74.cfg
+++ b/fc39ascl74.cfg
@@ -3,7 +3,7 @@ include('fc39a.tpl')
 config_opts['root'] = 'scl74fc39a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc39a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39ascl74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39ascl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39ascl80.cfg b/fc39ascl80.cfg
index 738d16c..b3ed8fe 100644
--- a/fc39ascl80.cfg
+++ b/fc39ascl80.cfg
@@ -3,7 +3,7 @@ include('fc39a.tpl')
 config_opts['root'] = 'scl80fc39a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl80fc39a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39ascl80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39ascl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39ascl81.cfg b/fc39ascl81.cfg
index eae2497..27453b0 100644
--- a/fc39ascl81.cfg
+++ b/fc39ascl81.cfg
@@ -3,7 +3,7 @@ include('fc39a.tpl')
 config_opts['root'] = 'scl81fc39a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl81fc39a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39ascl81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39ascl81/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39ascl82.cfg b/fc39ascl82.cfg
index 48b9248..84b879d 100644
--- a/fc39ascl82.cfg
+++ b/fc39ascl82.cfg
@@ -3,7 +3,7 @@ include('fc39a.tpl')
 config_opts['root'] = 'scl82fc39a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl82fc39a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39ascl82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39ascl82/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39ascl83.cfg b/fc39ascl83.cfg
index 3864dd4..7f1e66f 100644
--- a/fc39ascl83.cfg
+++ b/fc39ascl83.cfg
@@ -3,7 +3,7 @@ include('fc39a.tpl')
 config_opts['root'] = 'scl83fc39a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl83fc39a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39ascl83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39ascl83/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39ascl84.cfg b/fc39ascl84.cfg
index 832b950..45185dd 100644
--- a/fc39ascl84.cfg
+++ b/fc39ascl84.cfg
@@ -3,7 +3,7 @@ include('fc39a.tpl')
 config_opts['root'] = 'scl84fc39a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl84fc39a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39ascl84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39ascl84/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39x.cfg b/fc39x.cfg
index 299ad62..449f321 100644
--- a/fc39x.cfg
+++ b/fc39x.cfg
@@ -1,5 +1,5 @@
 include('fc39x.tpl')
 
 # Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 
diff --git a/fc39x.tpl b/fc39x.tpl
index 45c2e45..6754a43 100644
--- a/fc39x.tpl
+++ b/fc39x.tpl
@@ -8,11 +8,11 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '39'
 config_opts['package_manager'] = 'dnf'
 
-config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['resultdir'] = "/var/lib/mock/fc39x"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
diff --git a/fc39x74.cfg b/fc39x74.cfg
index 4d017a2..6a0aeba 100644
--- a/fc39x74.cfg
+++ b/fc39x74.cfg
@@ -2,10 +2,10 @@ import datetime;
 
 include('fc39x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['root'] = 'fc39x74'
 config_opts['resultdir'] = "/var/lib/mock/fc39x74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
diff --git a/fc39x80.cfg b/fc39x80.cfg
index cd9edab..69bde37 100644
--- a/fc39x80.cfg
+++ b/fc39x80.cfg
@@ -2,10 +2,10 @@ import datetime;
 
 include('fc39x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['root'] = 'fc39x80'
 config_opts['resultdir'] = "/var/lib/mock/fc39x80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
diff --git a/fc39x81.cfg b/fc39x81.cfg
index bc3481f..eb56283 100644
--- a/fc39x81.cfg
+++ b/fc39x81.cfg
@@ -2,10 +2,10 @@ import datetime;
 
 include('fc39x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['root'] = 'fc39x81'
 config_opts['resultdir'] = "/var/lib/mock/fc39x81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
diff --git a/fc39x82.cfg b/fc39x82.cfg
index 409de2f..80a33ef 100644
--- a/fc39x82.cfg
+++ b/fc39x82.cfg
@@ -2,10 +2,10 @@ import datetime;
 
 include('fc39x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['root'] = 'fc39x82'
 config_opts['resultdir'] = "/var/lib/mock/fc39x82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
diff --git a/fc39x83.cfg b/fc39x83.cfg
index e574e15..a27050e 100644
--- a/fc39x83.cfg
+++ b/fc39x83.cfg
@@ -2,10 +2,10 @@ import datetime;
 
 include('fc39x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['root'] = 'fc39x83'
 config_opts['resultdir'] = "/var/lib/mock/fc39x83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
diff --git a/fc39x84.cfg b/fc39x84.cfg
index e67e190..1d8c1a2 100644
--- a/fc39x84.cfg
+++ b/fc39x84.cfg
@@ -2,10 +2,10 @@ import datetime;
 
 include('fc39x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['root'] = 'fc39x84'
 config_opts['resultdir'] = "/var/lib/mock/fc39x84"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39x84/"
 
 config_opts['module_enable']  = ['php:remi-8.4']
 config_opts['module_install'] = ['php:remi-8.4/devel']
diff --git a/fc36xr70.cfg b/fc39xr80.cfg
index 0369cbe..dd3ba0a 100644
--- a/fc36xr70.cfg
+++ b/fc39xr80.cfg
@@ -1,15 +1,15 @@
 import datetime;
 
-include('fc36x.tpl')
+include('fc39x.tpl')
 
-config_opts['root'] = 'fc36x'
-config_opts['resultdir'] = "/var/lib/mock/fc36x"
+config_opts['root'] = 'fc39x'
+config_opts['resultdir'] = "/var/lib/mock/fc39x"
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-7.0"
-config_opts['macros']['%_module_version']="36" + nn;
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="39" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/fc39xscl74.cfg b/fc39xscl74.cfg
index 549c360..e0e047a 100644
--- a/fc39xscl74.cfg
+++ b/fc39xscl74.cfg
@@ -1,9 +1,9 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl74fc39x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php74-build php74-php-devel php74-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc39x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39xscl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39xscl80.cfg b/fc39xscl80.cfg
index 61e8327..3353b97 100644
--- a/fc39xscl80.cfg
+++ b/fc39xscl80.cfg
@@ -1,9 +1,9 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl80fc39x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php80-build php80-php-devel php80-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl80fc39x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39xscl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39xscl81.cfg b/fc39xscl81.cfg
index de4380c..256c097 100644
--- a/fc39xscl81.cfg
+++ b/fc39xscl81.cfg
@@ -1,9 +1,9 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl81fc39x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php81-build php81-php-devel php81-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl81fc39x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39xscl81/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39xscl82.cfg b/fc39xscl82.cfg
index ef6a5be..eead072 100644
--- a/fc39xscl82.cfg
+++ b/fc39xscl82.cfg
@@ -1,9 +1,9 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl82fc39x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php82-build php82-php-devel php82-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl82fc39x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39xscl82/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39xscl83.cfg b/fc39xscl83.cfg
index 4e7c7b0..1b0195e 100644
--- a/fc39xscl83.cfg
+++ b/fc39xscl83.cfg
@@ -1,9 +1,9 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl83fc39x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php83-build php83-php-devel php83-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl83fc39x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39xscl83/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc39xscl84.cfg b/fc39xscl84.cfg
index 6304f82..8e73d3f 100644
--- a/fc39xscl84.cfg
+++ b/fc39xscl84.cfg
@@ -1,9 +1,9 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl84fc39x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php84-build php84-php-devel php84-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl84fc39x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc39xscl84/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40a.tpl b/fc40a.tpl
index 10168e8..8efe93a 100644
--- a/fc40a.tpl
+++ b/fc40a.tpl
@@ -10,9 +10,9 @@ config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['resultdir'] = "/var/lib/mock/fc40a"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
@@ -88,7 +88,13 @@ skip_if_unavailable=True
 metadata_expire=10
 
 [remi-priv]
-name=remi prive
+name=remi private
+baseurl=file:/home/remi/priv/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-fc40]
+name=remi private fc40
 baseurl=file:/home/remi/priv/fc40.aarch64/
 enabled=1
 metadata_expire=10
diff --git a/fc40a74.cfg b/fc40a74.cfg
index 1a7f971..6bbce7c 100644
--- a/fc40a74.cfg
+++ b/fc40a74.cfg
@@ -5,7 +5,7 @@ include('fc40a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache remi-crypto-legacy'
 config_opts['root'] = 'fc40a74'
 config_opts['resultdir'] = "/var/lib/mock/fc40a74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
diff --git a/fc40a80.cfg b/fc40a80.cfg
index a379efc..54486b1 100644
--- a/fc40a80.cfg
+++ b/fc40a80.cfg
@@ -4,7 +4,7 @@ include('fc40a.tpl')
 
 config_opts['root'] = 'fc40a80'
 config_opts['resultdir'] = "/var/lib/mock/fc40a80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
diff --git a/fc40a81.cfg b/fc40a81.cfg
index 3e355a7..8164a42 100644
--- a/fc40a81.cfg
+++ b/fc40a81.cfg
@@ -4,7 +4,7 @@ include('fc40a.tpl')
 
 config_opts['root'] = 'fc40a81'
 config_opts['resultdir'] = "/var/lib/mock/fc40a81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
diff --git a/fc40a82.cfg b/fc40a82.cfg
index 4015481..b7b3781 100644
--- a/fc40a82.cfg
+++ b/fc40a82.cfg
@@ -4,7 +4,7 @@ include('fc40a.tpl')
 
 config_opts['root'] = 'fc40a82'
 config_opts['resultdir'] = "/var/lib/mock/fc40a82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
diff --git a/fc40a83.cfg b/fc40a83.cfg
index a7c8252..1f8d1eb 100644
--- a/fc40a83.cfg
+++ b/fc40a83.cfg
@@ -4,7 +4,7 @@ include('fc40a.tpl')
 
 config_opts['root'] = 'fc40a83'
 config_opts['resultdir'] = "/var/lib/mock/fc40a83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
diff --git a/fc40a84.cfg b/fc40a84.cfg
index ea906cb..a1c14d8 100644
--- a/fc40a84.cfg
+++ b/fc40a84.cfg
@@ -4,7 +4,7 @@ include('fc40a.tpl')
 
 config_opts['root'] = 'fc40a84'
 config_opts['resultdir'] = "/var/lib/mock/fc40a84"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40a84/"
 
 config_opts['module_enable']  = ['php:remi-8.4']
 config_opts['module_install'] = ['php:remi-8.4/devel']
diff --git a/fc36xr72.cfg b/fc40ar80.cfg
index e85208b..4c2c009 100644
--- a/fc36xr72.cfg
+++ b/fc40ar80.cfg
@@ -1,15 +1,15 @@
 import datetime;
 
-include('fc36x.tpl')
+include('fc40a.tpl')
 
-config_opts['root'] = 'fc36x'
-config_opts['resultdir'] = "/var/lib/mock/fc36x"
+config_opts['root'] = 'fc40a'
+config_opts['resultdir'] = "/var/lib/mock/fc40a"
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-7.2"
-config_opts['macros']['%_module_version']="36" + nn;
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="40" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/fc40ascl74.cfg b/fc40ascl74.cfg
index c2290a9..9122835 100644
--- a/fc40ascl74.cfg
+++ b/fc40ascl74.cfg
@@ -3,7 +3,7 @@ include('fc40a.tpl')
 config_opts['root'] = 'scl74fc40a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc40a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40ascl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40ascl80.cfg b/fc40ascl80.cfg
index 70553cd..9ef4c35 100644
--- a/fc40ascl80.cfg
+++ b/fc40ascl80.cfg
@@ -3,7 +3,7 @@ include('fc40a.tpl')
 config_opts['root'] = 'scl80fc40a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl80fc40a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40ascl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40ascl81.cfg b/fc40ascl81.cfg
index 14e1eeb..f0af895 100644
--- a/fc40ascl81.cfg
+++ b/fc40ascl81.cfg
@@ -3,7 +3,7 @@ include('fc40a.tpl')
 config_opts['root'] = 'scl81fc40a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl81fc40a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40ascl81/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40ascl82.cfg b/fc40ascl82.cfg
index 1ff53e4..acd0f61 100644
--- a/fc40ascl82.cfg
+++ b/fc40ascl82.cfg
@@ -3,7 +3,7 @@ include('fc40a.tpl')
 config_opts['root'] = 'scl82fc40a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl82fc40a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40ascl82/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40ascl83.cfg b/fc40ascl83.cfg
index 844e783..bcb3c00 100644
--- a/fc40ascl83.cfg
+++ b/fc40ascl83.cfg
@@ -3,7 +3,7 @@ include('fc40a.tpl')
 config_opts['root'] = 'scl83fc40a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl83fc40a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40ascl83/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40ascl84.cfg b/fc40ascl84.cfg
index a1931a4..dc4ad42 100644
--- a/fc40ascl84.cfg
+++ b/fc40ascl84.cfg
@@ -3,7 +3,7 @@ include('fc40a.tpl')
 config_opts['root'] = 'scl84fc40a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl84fc40a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40ascl84/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40x.cfg b/fc40x.cfg
index 4d337f7..eaad8bb 100644
--- a/fc40x.cfg
+++ b/fc40x.cfg
@@ -1,5 +1,5 @@
 include('fc40x.tpl')
 
 # Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 
diff --git a/fc40x.tpl b/fc40x.tpl
index 5ea6162..f7301ae 100644
--- a/fc40x.tpl
+++ b/fc40x.tpl
@@ -2,17 +2,17 @@ include('vendor.tpl')
 
 config_opts['root'] = 'fc40x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc ccache remi-crypto-legacy'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc remi-crypto-legacy'
 config_opts['dist'] = 'fc40'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '40'
 config_opts['package_manager'] = 'dnf'
 
-config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['resultdir'] = "/var/lib/mock/fc40x"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
diff --git a/fc40x74.cfg b/fc40x74.cfg
index 67f196c..361948c 100644
--- a/fc40x74.cfg
+++ b/fc40x74.cfg
@@ -4,7 +4,7 @@ include('fc40x.tpl')
 
 config_opts['root'] = 'fc40x74'
 config_opts['resultdir'] = "/var/lib/mock/fc40x74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
diff --git a/fc40x80.cfg b/fc40x80.cfg
index a1eccf5..511c122 100644
--- a/fc40x80.cfg
+++ b/fc40x80.cfg
@@ -4,7 +4,7 @@ include('fc40x.tpl')
 
 config_opts['root'] = 'fc40x80'
 config_opts['resultdir'] = "/var/lib/mock/fc40x80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
diff --git a/fc40x81.cfg b/fc40x81.cfg
index 4b82a05..3a4d8f8 100644
--- a/fc40x81.cfg
+++ b/fc40x81.cfg
@@ -4,7 +4,7 @@ include('fc40x.tpl')
 
 config_opts['root'] = 'fc40x81'
 config_opts['resultdir'] = "/var/lib/mock/fc40x81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
diff --git a/fc40x82.cfg b/fc40x82.cfg
index ba33c8b..e81e875 100644
--- a/fc40x82.cfg
+++ b/fc40x82.cfg
@@ -4,7 +4,7 @@ include('fc40x.tpl')
 
 config_opts['root'] = 'fc40x82'
 config_opts['resultdir'] = "/var/lib/mock/fc40x82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
diff --git a/fc40x83.cfg b/fc40x83.cfg
index a20353d..559be4e 100644
--- a/fc40x83.cfg
+++ b/fc40x83.cfg
@@ -4,7 +4,7 @@ include('fc40x.tpl')
 
 config_opts['root'] = 'fc40x83'
 config_opts['resultdir'] = "/var/lib/mock/fc40x83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
diff --git a/fc40x84.cfg b/fc40x84.cfg
index 227a017..65f1749 100644
--- a/fc40x84.cfg
+++ b/fc40x84.cfg
@@ -4,7 +4,7 @@ include('fc40x.tpl')
 
 config_opts['root'] = 'fc40x84'
 config_opts['resultdir'] = "/var/lib/mock/fc40x84"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40x84/"
 
 config_opts['module_enable']  = ['php:remi-8.4']
 config_opts['module_install'] = ['php:remi-8.4/devel']
diff --git a/fc36xr60.cfg b/fc40xr80.cfg
index 535af23..78a531f 100644
--- a/fc36xr60.cfg
+++ b/fc40xr80.cfg
@@ -1,15 +1,15 @@
 import datetime;
 
-include('fc36x.tpl')
+include('fc40x.tpl')
 
-config_opts['root'] = 'fc36x'
-config_opts['resultdir'] = "/var/lib/mock/fc36x"
+config_opts['root'] = 'fc40x'
+config_opts['resultdir'] = "/var/lib/mock/fc40x"
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="redis"
-config_opts['macros']['%_module_stream']="remi-6.0"
-config_opts['macros']['%_module_version']="36" + nn;
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="40" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
diff --git a/fc40xscl74.cfg b/fc40xscl74.cfg
index e112ece..004fbf2 100644
--- a/fc40xscl74.cfg
+++ b/fc40xscl74.cfg
@@ -1,9 +1,9 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl74fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php74-build php74-php-devel php74-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc40x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40xscl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40xscl80.cfg b/fc40xscl80.cfg
index 8b7bd18..5c801c1 100644
--- a/fc40xscl80.cfg
+++ b/fc40xscl80.cfg
@@ -1,9 +1,9 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl80fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php80-build php80-php-devel php80-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl80fc40x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40xscl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40xscl81.cfg b/fc40xscl81.cfg
index 6ef7214..6c0c6f2 100644
--- a/fc40xscl81.cfg
+++ b/fc40xscl81.cfg
@@ -1,9 +1,9 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl81fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php81-build php81-php-devel php81-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl81fc40x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40xscl81/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40xscl82.cfg b/fc40xscl82.cfg
index 20a6262..f04878e 100644
--- a/fc40xscl82.cfg
+++ b/fc40xscl82.cfg
@@ -1,9 +1,9 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl82fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php82-build php82-php-devel php82-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl82fc40x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40xscl82/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40xscl83.cfg b/fc40xscl83.cfg
index 035ea26..6ae26bd 100644
--- a/fc40xscl83.cfg
+++ b/fc40xscl83.cfg
@@ -1,9 +1,9 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl83fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php83-build php83-php-devel php83-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl83fc40x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40xscl83/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc40xscl84.cfg b/fc40xscl84.cfg
index 0dcd18e..f1da32b 100644
--- a/fc40xscl84.cfg
+++ b/fc40xscl84.cfg
@@ -1,9 +1,9 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl84fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php84-build php84-php-devel php84-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl84fc40x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc40xscl84/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41a.tpl b/fc41a.tpl
index 5fbd6ad..16f28f9 100644
--- a/fc41a.tpl
+++ b/fc41a.tpl
@@ -10,9 +10,9 @@ config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['resultdir'] = "/var/lib/mock/fc41a"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
@@ -54,8 +54,8 @@ metadata_expire=80000
 ##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-41&arch=aarch64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/41/Everything/aarch64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/41/Everything/aarch64/os/
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/aarch64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Everything/aarch64/os/
+#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/aarch64/os/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Everything/aarch64/os/
 
 [updates]
 name=updates
@@ -89,7 +89,13 @@ skip_if_unavailable=True
 metadata_expire=10
 
 [remi-priv]
-name=remi prive
+name=remi private
+baseurl=file:/home/remi/priv/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-fc41]
+name=remi private fc41
 baseurl=file:/home/remi/priv/fc41.aarch64/
 enabled=1
 metadata_expire=10
diff --git a/fc41a74.cfg b/fc41a74.cfg
index 9fa2fa3..cfbe8ec 100644
--- a/fc41a74.cfg
+++ b/fc41a74.cfg
@@ -5,7 +5,7 @@ include('fc41a.tpl')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache remi-crypto-legacy'
 config_opts['root'] = 'fc41a74'
 config_opts['resultdir'] = "/var/lib/mock/fc41a74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
diff --git a/fc41a80.cfg b/fc41a80.cfg
index 3a4fa55..41c14df 100644
--- a/fc41a80.cfg
+++ b/fc41a80.cfg
@@ -4,7 +4,7 @@ include('fc41a.tpl')
 
 config_opts['root'] = 'fc41a80'
 config_opts['resultdir'] = "/var/lib/mock/fc41a80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
diff --git a/fc41a81.cfg b/fc41a81.cfg
index 2bff2d7..5e504c4 100644
--- a/fc41a81.cfg
+++ b/fc41a81.cfg
@@ -4,7 +4,7 @@ include('fc41a.tpl')
 
 config_opts['root'] = 'fc41a81'
 config_opts['resultdir'] = "/var/lib/mock/fc41a81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
diff --git a/fc41a82.cfg b/fc41a82.cfg
index 45868f2..66e7b21 100644
--- a/fc41a82.cfg
+++ b/fc41a82.cfg
@@ -4,7 +4,7 @@ include('fc41a.tpl')
 
 config_opts['root'] = 'fc41a82'
 config_opts['resultdir'] = "/var/lib/mock/fc41a82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
diff --git a/fc41a83.cfg b/fc41a83.cfg
index a7961d3..75aedee 100644
--- a/fc41a83.cfg
+++ b/fc41a83.cfg
@@ -4,7 +4,7 @@ include('fc41a.tpl')
 
 config_opts['root'] = 'fc41a83'
 config_opts['resultdir'] = "/var/lib/mock/fc41a83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
diff --git a/fc41a84.cfg b/fc41a84.cfg
index cf2d519..c0b851d 100644
--- a/fc41a84.cfg
+++ b/fc41a84.cfg
@@ -4,7 +4,7 @@ include('fc41a.tpl')
 
 config_opts['root'] = 'fc41a84'
 config_opts['resultdir'] = "/var/lib/mock/fc41a84"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41a84/"
 
 config_opts['module_enable']  = ['php:remi-8.4']
 config_opts['module_install'] = ['php:remi-8.4/devel']
diff --git a/fc41ar80.cfg b/fc41ar80.cfg
new file mode 100644
index 0000000..032d394
--- /dev/null
+++ b/fc41ar80.cfg
@@ -0,0 +1,15 @@
+import datetime;
+
+include('fc41a.tpl')
+
+config_opts['root'] = 'fc41a'
+config_opts['resultdir'] = "/var/lib/mock/fc41a"
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="41" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/fc41ascl74.cfg b/fc41ascl74.cfg
index 0caa541..0fa6cc3 100644
--- a/fc41ascl74.cfg
+++ b/fc41ascl74.cfg
@@ -3,7 +3,7 @@ include('fc41a.tpl')
 config_opts['root'] = 'scl74fc41a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc41a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41ascl74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41ascl80.cfg b/fc41ascl80.cfg
index 81c3e6c..489f949 100644
--- a/fc41ascl80.cfg
+++ b/fc41ascl80.cfg
@@ -3,7 +3,7 @@ include('fc41a.tpl')
 config_opts['root'] = 'scl80fc41a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl80fc41a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41ascl80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41ascl81.cfg b/fc41ascl81.cfg
index 1a3a456..6812cb2 100644
--- a/fc41ascl81.cfg
+++ b/fc41ascl81.cfg
@@ -3,7 +3,7 @@ include('fc41a.tpl')
 config_opts['root'] = 'scl81fc41a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl81fc41a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41ascl81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl81/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41ascl82.cfg b/fc41ascl82.cfg
index cadff74..ccf13ec 100644
--- a/fc41ascl82.cfg
+++ b/fc41ascl82.cfg
@@ -3,7 +3,7 @@ include('fc41a.tpl')
 config_opts['root'] = 'scl82fc41a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl82fc41a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41ascl82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl82/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41ascl83.cfg b/fc41ascl83.cfg
index c546739..02ea524 100644
--- a/fc41ascl83.cfg
+++ b/fc41ascl83.cfg
@@ -3,7 +3,7 @@ include('fc41a.tpl')
 config_opts['root'] = 'scl83fc41a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl83fc41a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41ascl83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl83/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41ascl84.cfg b/fc41ascl84.cfg
index 221d831..f20cd7b 100644
--- a/fc41ascl84.cfg
+++ b/fc41ascl84.cfg
@@ -3,7 +3,7 @@ include('fc41a.tpl')
 config_opts['root'] = 'scl84fc41a'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl84fc41a"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41ascl84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl84/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41ascl85.cfg b/fc41ascl85.cfg
new file mode 100644
index 0000000..aa8fdba
--- /dev/null
+++ b/fc41ascl85.cfg
@@ -0,0 +1,26 @@
+include('fc41a.tpl')
+
+config_opts['root'] = 'scl85fc41a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php85-build php85-php-devel php85-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl85fc41a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41ascl85/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1485410
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl85fc41a]
+name=result-scl85fc41a
+baseurl=file:///var/lib/mock/scl85fc41a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc41x.cfg b/fc41x.cfg
index 51c6d67..ef2db2f 100644
--- a/fc41x.cfg
+++ b/fc41x.cfg
@@ -1,5 +1,5 @@
 include('fc41x.tpl')
 
 # Temp
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 
diff --git a/fc41x.tpl b/fc41x.tpl
index 60bbbbb..9edadbd 100644
--- a/fc41x.tpl
+++ b/fc41x.tpl
@@ -2,17 +2,17 @@ include('vendor.tpl')
 
 config_opts['root'] = 'fc41x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc ccache remi-crypto-legacy'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc remi-crypto-legacy'
 config_opts['dist'] = 'fc41'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '41'
 config_opts['package_manager'] = 'dnf'
 
-config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x/"
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['basedir'] = '/dev/build/'
 config_opts['resultdir'] = "/var/lib/mock/fc41x"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
@@ -54,8 +54,8 @@ metadata_expire=80000
 ##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-41&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/41/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/41/Everything/x86_64/os/
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/x86_64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Everything/x86_64/os/
+#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/x86_64/os/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Everything/x86_64/os/
 
 [updates]
 name=updates
diff --git a/fc41x74.cfg b/fc41x74.cfg
index 5c54ece..f3675af 100644
--- a/fc41x74.cfg
+++ b/fc41x74.cfg
@@ -4,7 +4,7 @@ include('fc41x.tpl')
 
 config_opts['root'] = 'fc41x74'
 config_opts['resultdir'] = "/var/lib/mock/fc41x74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
diff --git a/fc41x80.cfg b/fc41x80.cfg
index 042c1e2..caf6694 100644
--- a/fc41x80.cfg
+++ b/fc41x80.cfg
@@ -4,7 +4,7 @@ include('fc41x.tpl')
 
 config_opts['root'] = 'fc41x80'
 config_opts['resultdir'] = "/var/lib/mock/fc41x80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
diff --git a/fc41x81.cfg b/fc41x81.cfg
index a3509fb..6828c57 100644
--- a/fc41x81.cfg
+++ b/fc41x81.cfg
@@ -4,7 +4,7 @@ include('fc41x.tpl')
 
 config_opts['root'] = 'fc41x81'
 config_opts['resultdir'] = "/var/lib/mock/fc41x81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
diff --git a/fc41x82.cfg b/fc41x82.cfg
index 910a266..4c693fa 100644
--- a/fc41x82.cfg
+++ b/fc41x82.cfg
@@ -4,7 +4,7 @@ include('fc41x.tpl')
 
 config_opts['root'] = 'fc41x82'
 config_opts['resultdir'] = "/var/lib/mock/fc41x82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
diff --git a/fc41x83.cfg b/fc41x83.cfg
index 33b0d0f..5ef2bce 100644
--- a/fc41x83.cfg
+++ b/fc41x83.cfg
@@ -4,7 +4,7 @@ include('fc41x.tpl')
 
 config_opts['root'] = 'fc41x83'
 config_opts['resultdir'] = "/var/lib/mock/fc41x83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
diff --git a/fc41x84.cfg b/fc41x84.cfg
index a49cb22..43ec89a 100644
--- a/fc41x84.cfg
+++ b/fc41x84.cfg
@@ -4,7 +4,7 @@ include('fc41x.tpl')
 
 config_opts['root'] = 'fc41x84'
 config_opts['resultdir'] = "/var/lib/mock/fc41x84"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41x84/"
 
 config_opts['module_enable']  = ['php:remi-8.4']
 config_opts['module_install'] = ['php:remi-8.4/devel']
diff --git a/fc41xr80.cfg b/fc41xr80.cfg
new file mode 100644
index 0000000..48cbeca
--- /dev/null
+++ b/fc41xr80.cfg
@@ -0,0 +1,15 @@
+import datetime;
+
+include('fc41x.tpl')
+
+config_opts['root'] = 'fc41x'
+config_opts['resultdir'] = "/var/lib/mock/fc41x"
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="41" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/fc41xscl74.cfg b/fc41xscl74.cfg
index e9df0af..b21f1bc 100644
--- a/fc41xscl74.cfg
+++ b/fc41xscl74.cfg
@@ -1,9 +1,9 @@
 include('fc41x.tpl')
 
 config_opts['root'] = 'scl74fc41x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php74-build php74-php-devel php74-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl74fc41x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41xscl74/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41xscl80.cfg b/fc41xscl80.cfg
index 81ca100..54df442 100644
--- a/fc41xscl80.cfg
+++ b/fc41xscl80.cfg
@@ -1,9 +1,9 @@
 include('fc41x.tpl')
 
 config_opts['root'] = 'scl80fc41x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php80-build php80-php-devel php80-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl80fc41x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41xscl80/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41xscl81.cfg b/fc41xscl81.cfg
index 8b067b4..fc53c47 100644
--- a/fc41xscl81.cfg
+++ b/fc41xscl81.cfg
@@ -1,9 +1,9 @@
 include('fc41x.tpl')
 
 config_opts['root'] = 'scl81fc41x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php81-build php81-php-devel php81-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl81fc41x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41xscl81/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl81/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41xscl82.cfg b/fc41xscl82.cfg
index 3319f3a..49c621a 100644
--- a/fc41xscl82.cfg
+++ b/fc41xscl82.cfg
@@ -1,9 +1,9 @@
 include('fc41x.tpl')
 
 config_opts['root'] = 'scl82fc41x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php82-build php82-php-devel php82-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl82fc41x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41xscl82/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl82/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41xscl83.cfg b/fc41xscl83.cfg
index 7471080..cefd0d9 100644
--- a/fc41xscl83.cfg
+++ b/fc41xscl83.cfg
@@ -1,9 +1,9 @@
 include('fc41x.tpl')
 
 config_opts['root'] = 'scl83fc41x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php83-build php83-php-devel php83-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl83fc41x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41xscl83/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl83/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc41xscl84.cfg b/fc41xscl84.cfg
index da491f3..7976c82 100644
--- a/fc41xscl84.cfg
+++ b/fc41xscl84.cfg
@@ -1,9 +1,9 @@
 include('fc41x.tpl')
 
 config_opts['root'] = 'scl84fc41x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php84-build php84-php-devel php84-php-pear'
 config_opts['resultdir'] = "/var/lib/mock/scl84fc41x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41xscl84/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl84/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
diff --git a/fc37xscl83.cfg b/fc41xscl85.cfg
index d36b308..73d9cf3 100644
--- a/fc37xscl83.cfg
+++ b/fc41xscl85.cfg
@@ -1,24 +1,24 @@
-include('fc37x.tpl')
+include('fc41x.tpl')
 
-config_opts['root'] = 'scl83fc37x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl83fc37x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl83/"
+config_opts['root'] = 'scl85fc41x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php85-build php85-php-devel php85-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl85fc41x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc41xscl85/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
 
 config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484370
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1485410
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
 config_opts['yum.conf'] += """
-[result-scl83fc37x]
-name=result-scl83fc37x
-baseurl=file:///var/lib/mock/scl83fc37x/
+[result-scl85fc41x]
+name=result-scl85fc41x
+baseurl=file:///var/lib/mock/scl85fc41x/
 enabled=1
 metadata_expire=10
 skip_if_unavailable=True
diff --git a/fc38x.cfg b/fc42a.cfg
index 72891da..aca29e1 100644
--- a/fc38x.cfg
+++ b/fc42a.cfg
@@ -1,4 +1,4 @@
-include('fc38x.tpl')
+include('fc42a.tpl')
 
 # Temp
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
diff --git a/fc37x.tpl b/fc42a.tpl
index c97862b..c3f7b50 100644
--- a/fc37x.tpl
+++ b/fc42a.tpl
@@ -1,19 +1,19 @@
 include('vendor.tpl')
 
-config_opts['root'] = 'fc37x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc'
-config_opts['dist'] = 'fc37'  # only useful for --resultdir variable subst
+config_opts['root'] = 'fc42a'
+config_opts['target_arch'] = 'aarch64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc remi-crypto-legacy'
+config_opts['dist'] = 'fc42'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '37'
+config_opts['releasever'] = '42'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['plugin_conf']['ccache_enable'] = True
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a/"
 
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc37x"
+config_opts['basedir'] = '/dev/build/'
+config_opts['resultdir'] = "/var/lib/mock/fc42a"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
@@ -21,11 +21,12 @@ config_opts['createrepo_on_rpms'] = True
 config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
-config_opts['macros']['%_smp_mflags']="-j15"
-config_opts['macros']['%dist']=".fc37.remi"
-config_opts['macros']['%fedora']="37"
+config_opts['macros']['%_smp_mflags']="-j24"
+config_opts['macros']['%dist']=".fc42.remi"
+config_opts['macros']['%fedora']="42"
 config_opts['macros']['%_with_ibase']="1"
 config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
 config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
@@ -48,56 +49,66 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-37&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/37/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/37/Everything/x86_64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/37/Everything/x86_64/os/
+##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-42&arch=aarch64
+#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/42/Everything/aarch64/os/
+#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/42/Everything/aarch64/os/
+#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/42/Everything/aarch64/os/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/42/Everything/aarch64/os/
 
 [updates]
 name=updates
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f37&arch=x86_64
-#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/37/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/37/x86_64/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f42&arch=aarch64
+#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/aarch64/
+#	http://mirrors.ircam.fr/pub/fedora/linux/updates/42/aarch64/
+#	http://fr2.rpmfind.net/linux/fedora/updates/42/aarch64/
+#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/aarch64/
 enabled=1
 	
 [updates-testing]
 name=updates-testing
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f37&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/37/Everything/x86_64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f42&arch=aarch64
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/42/Everything/aarch64/
 enabled=0
 
 [remi]
 name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/37/remi/x86_64/
+baseurl=http://remi/repo/fedora/42/remi/aarch64/
 enabled=1
+skip_if_unavailable=True
 metadata_expire=10
 
 [remi-modular]
 name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/fedora/37/modular/x86_64/
+baseurl=http://remi/repo/fedora/42/modular/aarch64/
 enabled=1
+skip_if_unavailable=True
 metadata_expire=10
 
 [remi-priv]
-name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
+name=remi private
+baseurl=file:/home/remi/priv/aarch64/
+enabled=1
+metadata_expire=30
+
+[remi-priv-fc41]
+name=remi private fc41
+baseurl=file:/home/remi/priv/fc42.aarch64/
 enabled=1
 metadata_expire=10
+skip_if_unavailable=True
 
 [remi-debuginfo]
 name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/37/debug-remi/x86_64/
-enabled=1
+baseurl=http://remi/repo/fedora/42/debug-remi/aarch64/
+enabled=0
 
-[result-fc37x]
-name=result-fc37x
-baseurl=file:/var/lib/mock/fc37x/
+[result-fc42a]
+name=result-fc42a
+baseurl=file:/var/lib/mock/fc42a/
 metadata_expire=10
 enabled=1
 skip_if_unavailable=True
diff --git a/fc37x74.cfg b/fc42a74.cfg
index 324e732..5e1fa95 100644
--- a/fc37x74.cfg
+++ b/fc42a74.cfg
@@ -1,11 +1,11 @@
 import datetime;
 
-include('fc37x.tpl')
+include('fc42a.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc37x74'
-config_opts['resultdir'] = "/var/lib/mock/fc37x74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37x74/"
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache remi-crypto-legacy'
+config_opts['root'] = 'fc42a74'
+config_opts['resultdir'] = "/var/lib/mock/fc42a74"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
@@ -14,14 +14,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-7.4"
-config_opts['macros']['%_module_version']="37" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc37x74]
-name=result-fc37x74
-baseurl=file:/var/lib/mock/fc37x74/
+[result-fc42a74]
+name=result-fc42a74
+baseurl=file:/var/lib/mock/fc42a74/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc38x80.cfg b/fc42a80.cfg
index d69a1a2..8374512 100644
--- a/fc38x80.cfg
+++ b/fc42a80.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc38x.tpl')
+include('fc42a.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc38x80'
-config_opts['resultdir'] = "/var/lib/mock/fc38x80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38x80/"
+config_opts['root'] = 'fc42a80'
+config_opts['resultdir'] = "/var/lib/mock/fc42a80"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.0"
-config_opts['macros']['%_module_version']="38" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc38x80]
-name=result-fc38x80
-baseurl=file:/var/lib/mock/fc38x80/
+[result-fc42a80]
+name=result-fc42a80
+baseurl=file:/var/lib/mock/fc42a80/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc38x81.cfg b/fc42a81.cfg
index bbc98f1..05fc965 100644
--- a/fc38x81.cfg
+++ b/fc42a81.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc38x.tpl')
+include('fc42a.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc38x81'
-config_opts['resultdir'] = "/var/lib/mock/fc38x81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38x81/"
+config_opts['root'] = 'fc42a81'
+config_opts['resultdir'] = "/var/lib/mock/fc42a81"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.1"
-config_opts['macros']['%_module_version']="38" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc38x81]
-name=result-fc38x81
-baseurl=file:/var/lib/mock/fc38x81/
+[result-fc42a81]
+name=result-fc42a81
+baseurl=file:/var/lib/mock/fc42a81/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc38x82.cfg b/fc42a82.cfg
index 2011bff..8bf7cf4 100644
--- a/fc38x82.cfg
+++ b/fc42a82.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc38x.tpl')
+include('fc42a.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc38x82'
-config_opts['resultdir'] = "/var/lib/mock/fc38x82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38x82/"
+config_opts['root'] = 'fc42a82'
+config_opts['resultdir'] = "/var/lib/mock/fc42a82"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.2"
-config_opts['macros']['%_module_version']="38" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc38x82]
-name=result-fc38x82
-baseurl=file:/var/lib/mock/fc38x82/
+[result-fc42a82]
+name=result-fc42a82
+baseurl=file:/var/lib/mock/fc42a82/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc37x83.cfg b/fc42a83.cfg
index a1e1407..70157f4 100644
--- a/fc37x83.cfg
+++ b/fc42a83.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc37x.tpl')
+include('fc42a.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc37x83'
-config_opts['resultdir'] = "/var/lib/mock/fc37x83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37x83/"
+config_opts['root'] = 'fc42a83'
+config_opts['resultdir'] = "/var/lib/mock/fc42a83"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.3"
-config_opts['macros']['%_module_version']="37" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc37x83]
-name=result-fc37x83
-baseurl=file:/var/lib/mock/fc37x83/
+[result-fc42a83]
+name=result-fc42a83
+baseurl=file:/var/lib/mock/fc42a83/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc42a84.cfg b/fc42a84.cfg
new file mode 100644
index 0000000..1565847
--- /dev/null
+++ b/fc42a84.cfg
@@ -0,0 +1,31 @@
+import datetime;
+
+include('fc42a.tpl')
+
+config_opts['root'] = 'fc42a84'
+config_opts['resultdir'] = "/var/lib/mock/fc42a84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42a84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="42" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc42a84]
+name=result-fc42a84
+baseurl=file:/var/lib/mock/fc42a84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc42ar80.cfg b/fc42ar80.cfg
new file mode 100644
index 0000000..9f97d1f
--- /dev/null
+++ b/fc42ar80.cfg
@@ -0,0 +1,15 @@
+import datetime;
+
+include('fc42a.tpl')
+
+config_opts['root'] = 'fc42a'
+config_opts['resultdir'] = "/var/lib/mock/fc42a"
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="42" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/fc42ascl74.cfg b/fc42ascl74.cfg
new file mode 100644
index 0000000..eaaeefb
--- /dev/null
+++ b/fc42ascl74.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl74fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl74fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl74/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl74fc42a]
+name=result-scl74fc42a
+baseurl=file:///var/lib/mock/scl74fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42ascl80.cfg b/fc42ascl80.cfg
new file mode 100644
index 0000000..a33cb86
--- /dev/null
+++ b/fc42ascl80.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl80fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl80fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl80/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl80fc42a]
+name=result-scl80fc42a
+baseurl=file:///var/lib/mock/scl80fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42ascl81.cfg b/fc42ascl81.cfg
new file mode 100644
index 0000000..86784f0
--- /dev/null
+++ b/fc42ascl81.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl81fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl81fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl81/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl81fc42a]
+name=result-scl81fc42a
+baseurl=file:///var/lib/mock/scl81fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42ascl82.cfg b/fc42ascl82.cfg
new file mode 100644
index 0000000..5a09eaf
--- /dev/null
+++ b/fc42ascl82.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl82fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl82fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl82/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl82fc42a]
+name=result-scl82fc42a
+baseurl=file:///var/lib/mock/scl82fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42ascl83.cfg b/fc42ascl83.cfg
new file mode 100644
index 0000000..9809ce0
--- /dev/null
+++ b/fc42ascl83.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl83fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl83fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl83/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl83fc42a]
+name=result-scl83fc42a
+baseurl=file:///var/lib/mock/scl83fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42ascl84.cfg b/fc42ascl84.cfg
new file mode 100644
index 0000000..6049eea
--- /dev/null
+++ b/fc42ascl84.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl84fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl84fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl84/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl84fc42a]
+name=result-scl84fc42a
+baseurl=file:///var/lib/mock/scl84fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42ascl85.cfg b/fc42ascl85.cfg
new file mode 100644
index 0000000..44f1242
--- /dev/null
+++ b/fc42ascl85.cfg
@@ -0,0 +1,26 @@
+include('fc42a.tpl')
+
+config_opts['root'] = 'scl85fc42a'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php85-build php85-php-devel php85-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl85fc42a"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42ascl85/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1485420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl85fc42a]
+name=result-scl85fc42a
+baseurl=file:///var/lib/mock/scl85fc42a/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42x.cfg b/fc42x.cfg
new file mode 100644
index 0000000..dcc3fbf
--- /dev/null
+++ b/fc42x.cfg
@@ -0,0 +1,5 @@
+include('fc42x.tpl')
+
+# Temp
+#config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
+
diff --git a/fc38x.tpl b/fc42x.tpl
index d1d6545..34292d5 100644
--- a/fc38x.tpl
+++ b/fc42x.tpl
@@ -1,19 +1,19 @@
 include('vendor.tpl')
 
-config_opts['root'] = 'fc38x'
+config_opts['root'] = 'fc42x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc'
-config_opts['dist'] = 'fc38'  # only useful for --resultdir variable subst
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc remi-crypto-legacy'
+config_opts['dist'] = 'fc42'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '38'
+config_opts['releasever'] = '42'
 config_opts['package_manager'] = 'dnf'
 
-config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38x/"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x/"
 
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc38x"
+config_opts['basedir'] = '/dev/build/'
+config_opts['resultdir'] = "/var/lib/mock/fc42x"
 config_opts['cleanup_on_success'] = True
 config_opts['cleanup_on_failure'] = False
 
@@ -22,10 +22,11 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j15"
-config_opts['macros']['%dist']=".fc38.remi"
-config_opts['macros']['%fedora']="38"
+config_opts['macros']['%dist']=".fc42.remi"
+config_opts['macros']['%fedora']="42"
 config_opts['macros']['%_with_ibase']="1"
 config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
 config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
@@ -48,57 +49,67 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-38&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/38/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/38/Everything/x86_64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/38/Everything/x86_64/os/
+##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-42&arch=x86_64
+#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/42/Everything/x86_64/os/
+#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/42/Everything/x86_64/os/
+#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/42/Everything/x86_64/os/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/42/Everything/x86_64/os/
 
 [updates]
 name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f38&arch=x86_64
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f42&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
-#	http://mirrors.ircam.fr/pub/fedora/linux/updates/38/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/38/x86_64/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/
+#	http://mirrors.ircam.fr/pub/fedora/linux/updates/42/x86_64/
+#	http://fr2.rpmfind.net/linux/fedora/updates/42/x86_64/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/42/Everything/x86_64/
 enabled=1
 	
 [updates-testing]
 name=updates-testing
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f38&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/38/Everything/x86_64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f42&arch=x86_64
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/42/Everything/x86_64/
 enabled=0
 
 [remi]
 name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/38/remi/x86_64/
+baseurl=file:/home/rpmbuild/site/rpms/fedora/42/remi/x86_64/
 enabled=1
+skip_if_unavailable=True
 metadata_expire=10
 
 [remi-modular]
 name=remi modular
-baseurl=file:/home/rpmbuild/site/rpms/fedora/38/modular/x86_64/
+baseurl=file:/home/rpmbuild/site/rpms/fedora/42/modular/x86_64/
 enabled=1
+skip_if_unavailable=True
 metadata_expire=10
 
-[remi-priv]
-name=remi prive
+[remi-priv-1]
+name=remi prive 1
 baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
 enabled=1
 metadata_expire=10
 
+[remi-priv-2]
+name=remi prive 2
+baseurl=file:/home/rpmbuild/site/rpms/priv/fc42.x86_64/
+enabled=1
+metadata_expire=10
+
 [remi-debuginfo]
 name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/38/debug-remi/x86_64/
+baseurl=file:/home/rpmbuild/site/rpms/fedora/42/debug-remi/x86_64/
 enabled=1
 
-[result-fc38x]
-name=result-fc38x
-baseurl=file:/var/lib/mock/fc38x/
+[result-fc42x]
+name=result-fc42x
+baseurl=file:/var/lib/mock/fc42x/
 metadata_expire=10
+priority=10
 enabled=1
 skip_if_unavailable=True
 
diff --git a/fc38x74.cfg b/fc42x74.cfg
index 7d4b70a..cad5b47 100644
--- a/fc38x74.cfg
+++ b/fc42x74.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc38x.tpl')
+include('fc42x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc38x74'
-config_opts['resultdir'] = "/var/lib/mock/fc38x74"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38x74/"
+config_opts['root'] = 'fc42x74'
+config_opts['resultdir'] = "/var/lib/mock/fc42x74"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x74/"
 
 config_opts['module_enable']  = ['php:remi-7.4']
 config_opts['module_install'] = ['php:remi-7.4/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-7.4"
-config_opts['macros']['%_module_version']="38" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc38x74]
-name=result-fc38x74
-baseurl=file:/var/lib/mock/fc38x74/
+[result-fc42x74]
+name=result-fc42x74
+baseurl=file:/var/lib/mock/fc42x74/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc37x80.cfg b/fc42x80.cfg
index 79336cb..d48544f 100644
--- a/fc37x80.cfg
+++ b/fc42x80.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc37x.tpl')
+include('fc42x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc37x80'
-config_opts['resultdir'] = "/var/lib/mock/fc37x80"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37x80/"
+config_opts['root'] = 'fc42x80'
+config_opts['resultdir'] = "/var/lib/mock/fc42x80"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x80/"
 
 config_opts['module_enable']  = ['php:remi-8.0']
 config_opts['module_install'] = ['php:remi-8.0/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.0"
-config_opts['macros']['%_module_version']="37" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc37x80]
-name=result-fc37x80
-baseurl=file:/var/lib/mock/fc37x80/
+[result-fc42x80]
+name=result-fc42x80
+baseurl=file:/var/lib/mock/fc42x80/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc37x81.cfg b/fc42x81.cfg
index 45f83cc..ea4169c 100644
--- a/fc37x81.cfg
+++ b/fc42x81.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc37x.tpl')
+include('fc42x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc37x81'
-config_opts['resultdir'] = "/var/lib/mock/fc37x81"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37x81/"
+config_opts['root'] = 'fc42x81'
+config_opts['resultdir'] = "/var/lib/mock/fc42x81"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x81/"
 
 config_opts['module_enable']  = ['php:remi-8.1']
 config_opts['module_install'] = ['php:remi-8.1/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.1"
-config_opts['macros']['%_module_version']="37" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc37x81]
-name=result-fc37x81
-baseurl=file:/var/lib/mock/fc37x81/
+[result-fc42x81]
+name=result-fc42x81
+baseurl=file:/var/lib/mock/fc42x81/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc37x82.cfg b/fc42x82.cfg
index 1aca16d..6a8ebf0 100644
--- a/fc37x82.cfg
+++ b/fc42x82.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc37x.tpl')
+include('fc42x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc37x82'
-config_opts['resultdir'] = "/var/lib/mock/fc37x82"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37x82/"
+config_opts['root'] = 'fc42x82'
+config_opts['resultdir'] = "/var/lib/mock/fc42x82"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x82/"
 
 config_opts['module_enable']  = ['php:remi-8.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.2"
-config_opts['macros']['%_module_version']="37" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc37x82]
-name=result-fc37x82
-baseurl=file:/var/lib/mock/fc37x82/
+[result-fc42x82]
+name=result-fc42x82
+baseurl=file:/var/lib/mock/fc42x82/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc38x83.cfg b/fc42x83.cfg
index 50b9fa7..1dc2b56 100644
--- a/fc38x83.cfg
+++ b/fc42x83.cfg
@@ -1,11 +1,10 @@
 import datetime;
 
-include('fc38x.tpl')
+include('fc42x.tpl')
 
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
-config_opts['root'] = 'fc38x83'
-config_opts['resultdir'] = "/var/lib/mock/fc38x83"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38x83/"
+config_opts['root'] = 'fc42x83'
+config_opts['resultdir'] = "/var/lib/mock/fc42x83"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x83/"
 
 config_opts['module_enable']  = ['php:remi-8.3']
 config_opts['module_install'] = ['php:remi-8.3/devel']
@@ -14,14 +13,14 @@ nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
 config_opts['macros']['%_module_name']="php"
 config_opts['macros']['%_module_stream']="remi-8.3"
-config_opts['macros']['%_module_version']="38" + nn;
+config_opts['macros']['%_module_version']="42" + nn;
 config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[result-fc38x83]
-name=result-fc38x83
-baseurl=file:/var/lib/mock/fc38x83/
+[result-fc42x83]
+name=result-fc42x83
+baseurl=file:/var/lib/mock/fc42x83/
 enabled=1
 metadata_expire=1
 module_hotfixes=1
diff --git a/fc42x84.cfg b/fc42x84.cfg
new file mode 100644
index 0000000..002f548
--- /dev/null
+++ b/fc42x84.cfg
@@ -0,0 +1,31 @@
+import datetime;
+
+include('fc42x.tpl')
+
+config_opts['root'] = 'fc42x84'
+config_opts['resultdir'] = "/var/lib/mock/fc42x84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42x84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="42" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc42x84]
+name=result-fc42x84
+baseurl=file:/var/lib/mock/fc42x84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc42xr80.cfg b/fc42xr80.cfg
new file mode 100644
index 0000000..4f2ee26
--- /dev/null
+++ b/fc42xr80.cfg
@@ -0,0 +1,15 @@
+import datetime;
+
+include('fc42x.tpl')
+
+config_opts['root'] = 'fc42x'
+config_opts['resultdir'] = "/var/lib/mock/fc42x"
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="redis"
+config_opts['macros']['%_module_stream']="remi-8.0"
+config_opts['macros']['%_module_version']="42" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/fc38xscl83.cfg b/fc42xscl74.cfg
index 7129da5..b358e85 100644
--- a/fc38xscl83.cfg
+++ b/fc42xscl74.cfg
@@ -1,24 +1,24 @@
-include('fc38x.tpl')
+include('fc42x.tpl')
 
-config_opts['root'] = 'scl83fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php83-build php83-php-devel php83-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl83fc38x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl83/"
+config_opts['root'] = 'scl74fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php74-build php74-php-devel php74-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl74fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl74/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
 
 config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484380
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
 config_opts['yum.conf'] += """
-[result-scl83fc38x]
-name=result-scl83fc38x
-baseurl=file:///var/lib/mock/scl83fc38x/
+[result-scl74fc42x]
+name=result-scl74fc42x
+baseurl=file:///var/lib/mock/scl74fc42x/
 enabled=1
 metadata_expire=10
 skip_if_unavailable=True
diff --git a/fc38xscl84.cfg b/fc42xscl80.cfg
index f8b26c0..eadc726 100644
--- a/fc38xscl84.cfg
+++ b/fc42xscl80.cfg
@@ -1,24 +1,24 @@
-include('fc38x.tpl')
+include('fc42x.tpl')
 
-config_opts['root'] = 'scl84fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build php84-php-devel php84-php-pear'
-config_opts['resultdir'] = "/var/lib/mock/scl84fc38x"
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl84/"
+config_opts['root'] = 'scl80fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php80-build php80-php-devel php80-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl80fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl80/"
 
 # Only needed to build main SCL package
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
 
 config_opts['macros']['%nophptag']="1"
-# Official (but temporary) workaround for https://bugzilla.redhat.com/1484380
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
 #config_opts['macros']['%_debugsource_packages']="%nil"
 # workaround for https://bugzilla.redhat.com/1485310
 config_opts['macros']['%_build_id_links']='none'
 
 config_opts['yum.conf'] += """
-[result-scl84fc38x]
-name=result-scl84fc38x
-baseurl=file:///var/lib/mock/scl84fc38x/
+[result-scl80fc42x]
+name=result-scl80fc42x
+baseurl=file:///var/lib/mock/scl80fc42x/
 enabled=1
 metadata_expire=10
 skip_if_unavailable=True
diff --git a/fc42xscl81.cfg b/fc42xscl81.cfg
new file mode 100644
index 0000000..50517cb
--- /dev/null
+++ b/fc42xscl81.cfg
@@ -0,0 +1,26 @@
+include('fc42x.tpl')
+
+config_opts['root'] = 'scl81fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php81-build php81-php-devel php81-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl81fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl81/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl81fc42x]
+name=result-scl81fc42x
+baseurl=file:///var/lib/mock/scl81fc42x/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42xscl82.cfg b/fc42xscl82.cfg
new file mode 100644
index 0000000..518a0e6
--- /dev/null
+++ b/fc42xscl82.cfg
@@ -0,0 +1,26 @@
+include('fc42x.tpl')
+
+config_opts['root'] = 'scl82fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php82-build php82-php-devel php82-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl82fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl82/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl82fc42x]
+name=result-scl82fc42x
+baseurl=file:///var/lib/mock/scl82fc42x/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42xscl83.cfg b/fc42xscl83.cfg
new file mode 100644
index 0000000..a68b250
--- /dev/null
+++ b/fc42xscl83.cfg
@@ -0,0 +1,26 @@
+include('fc42x.tpl')
+
+config_opts['root'] = 'scl83fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php83-build php83-php-devel php83-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl83fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl83/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl83fc42x]
+name=result-scl83fc42x
+baseurl=file:///var/lib/mock/scl83fc42x/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42xscl84.cfg b/fc42xscl84.cfg
new file mode 100644
index 0000000..4f8aaf5
--- /dev/null
+++ b/fc42xscl84.cfg
@@ -0,0 +1,26 @@
+include('fc42x.tpl')
+
+config_opts['root'] = 'scl84fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php84-build php84-php-devel php84-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl84fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl84/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1484420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl84fc42x]
+name=result-scl84fc42x
+baseurl=file:///var/lib/mock/scl84fc42x/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/fc42xscl85.cfg b/fc42xscl85.cfg
new file mode 100644
index 0000000..0771d64
--- /dev/null
+++ b/fc42xscl85.cfg
@@ -0,0 +1,26 @@
+include('fc42x.tpl')
+
+config_opts['root'] = 'scl85fc42x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy scl-utils-build php85-build php85-php-devel php85-php-pear'
+config_opts['resultdir'] = "/var/lib/mock/scl85fc42x"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/build/ccache.fc42xscl85/"
+
+# Only needed to build main SCL package
+config_opts['macros']['%scl_vendor']="remi"
+config_opts['macros']['%_scl_prefix']="/opt/remi"
+
+config_opts['macros']['%nophptag']="1"
+# Official (but temporary) workaround for https://bugzilla.redhat.com/1485420
+#config_opts['macros']['%_debugsource_packages']="%nil"
+# workaround for https://bugzilla.redhat.com/1485310
+config_opts['macros']['%_build_id_links']='none'
+
+config_opts['yum.conf'] += """
+[result-scl85fc42x]
+name=result-scl85fc42x
+baseurl=file:///var/lib/mock/scl85fc42x/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+
+"""
diff --git a/sclo654.cfg b/sclo654.cfg
deleted file mode 100644
index 0d9ab21..0000000
--- a/sclo654.cfg
+++ /dev/null
@@ -1,86 +0,0 @@
-config_opts['root'] = 'sclo654'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php54-build'
-config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el6x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/sclo654"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el6.centos"
-config_opts['macros']['%rhel']="6"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[base]
-name=BaseOS
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=6&arch=x86_64&repo=os
-
-[updates]
-name=updates
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=6&arch=x86_64&repo=updates
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64
-exclude=epel-rpm-macros
-
-[testing]
-name=epel-testing
-enabled=0
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-
-[centos-sclo-sclo]
-name=CentOS-7 - SCLo sclo
-baseurl=http://mirror.centos.org/centos/6/sclo/x86_64/sclo/
-gpgcheck=0
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/6/sclo/x86_64/rh/
-gpgcheck=0
-enabled=1
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[resultsclo654]
-name=resultsclo654
-baseurl=file:/var/lib/mock/sclo654/
-enabled=1
-
-"""
-
diff --git a/sclo754.cfg b/sclo754.cfg
deleted file mode 100644
index 48ffd4f..0000000
--- a/sclo754.cfg
+++ /dev/null
@@ -1,88 +0,0 @@
-config_opts['root'] = 'sclo754'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php54-build'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
-config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.el7x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/sclo754"
-config_opts['cleanup_on_success'] = True
-config_opts['cleanup_on_failure'] = False
-
-config_opts['createrepo_on_rpms'] = True
-config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
-
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el7.remi"
-config_opts['macros']['%rhel']="7"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-enabled=1
-
-[centos-updates]
-name=updates
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-enabled=1
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-enabled=1
-exclude=epel-rpm-macros
-
-[epel-testing]
-name=epel-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-enabled=0
-
-[centos-sclo-sclo]
-name=CentOS-7 - SCLo sclo
-baseurl=http://mirror.centos.org/centos/7/sclo/x86_64/sclo/
-gpgcheck=0
-enabled=1
-
-[centos-sclo-rh]
-name=CentOS-7 - SCLo rh
-baseurl=http://mirror.centos.org/centos/7/sclo/x86_64/rh/
-gpgcheck=0
-enabled=1
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-
-[resultsclo754]
-name=resultel7x
-baseurl=file:/var/lib/mock/sclo754/
-enabled=1
-
-
-"""
-
diff --git a/vendor.tpl b/vendor.tpl
index 829657f..c0649e0 100644
--- a/vendor.tpl
+++ b/vendor.tpl
@@ -3,3 +3,5 @@ config_opts['macros']['%packager']="Remi Collet"
 config_opts['macros']['%vendeur']="remi"
 config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 
+config_opts['macros']['%_with_generators']="1"
+