fix scl84 buildroot

9 files changed, 9 insertions, 10 deletions

diff --git a/el8ascl84.cfg b/el8ascl84.cfg
index c92ba1f..81746d4 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 php83-php-devel php83-php-pear'
+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['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.0']
 
diff --git a/el8xscl84.cfg b/el8xscl84.cfg
index 122165e..dcada1c 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 php83-php-devel php83-php-pear'
+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['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.0']
 
diff --git a/el9ascl84.cfg b/el9ascl84.cfg
index 82857c8..7fa6e6f 100644
--- a/el9ascl84.cfg
+++ b/el9ascl84.cfg
@@ -2,7 +2,7 @@ include('el9a.tpl')
 
 config_opts['root'] = 'scl84el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl84el9a"
-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 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 remi-crypto-legacy php84-build php84-php-devel php84-php-pear'
 
 config_opts['module_enable'] = ['redis:remi-7.0']
 
diff --git a/el9xscl84.cfg b/el9xscl84.cfg
index f6a4144..aa946f2 100644
--- a/el9xscl84.cfg
+++ b/el9xscl84.cfg
@@ -2,7 +2,7 @@ include('el9x.tpl')
 
 config_opts['root'] = 'scl84el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl84el9x"
-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 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 remi-crypto-legacy php84-build php84-php-devel php84-php-pear'
 
 config_opts['module_enable'] = ['redis:remi-7.0']
 
diff --git a/fc38xscl84.cfg b/fc38xscl84.cfg
index f048a81..f8b26c0 100644
--- a/fc38xscl84.cfg
+++ b/fc38xscl84.cfg
@@ -1,7 +1,7 @@
 include('fc38x.tpl')
 
 config_opts['root'] = 'scl84fc38x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build php83-php-devel php83-php-pear'
+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/"
 
diff --git a/fc39ascl84.cfg b/fc39ascl84.cfg
index 5f69d54..832b950 100644
--- a/fc39ascl84.cfg
+++ b/fc39ascl84.cfg
@@ -1,7 +1,7 @@
 include('fc39a.tpl')
 
 config_opts['root'] = 'scl84fc39a'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build php83-php-devel php83-php-pear'
+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/"
 
diff --git a/fc39xscl84.cfg b/fc39xscl84.cfg
index cdfd608..6304f82 100644
--- a/fc39xscl84.cfg
+++ b/fc39xscl84.cfg
@@ -1,8 +1,7 @@
 include('fc39x.tpl')
 
 config_opts['root'] = 'scl84fc39x'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build php83-php-devel php83-php-pear'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php84-build'
+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/scl84fc39x"
 config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39xscl84/"
 
diff --git a/fc40ascl84.cfg b/fc40ascl84.cfg
index 4d67e23..a1931a4 100644
--- a/fc40ascl84.cfg
+++ b/fc40ascl84.cfg
@@ -1,7 +1,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 php83-php-devel php83-php-pear'
+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/"
 
diff --git a/fc40xscl84.cfg b/fc40xscl84.cfg
index 27257de..0dcd18e 100644
--- a/fc40xscl84.cfg
+++ b/fc40xscl84.cfg
@@ -1,7 +1,7 @@
 include('fc40x.tpl')
 
 config_opts['root'] = 'scl84fc40x'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php84-build php83-php-devel php83-php-pear'
+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/scl84fc40x"
 config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl84/"