dedicated root for Redis 8.2

12 files changed, 14 insertions, 12 deletions

diff --git a/el10ar82.cfg b/el10ar82.cfg
index 7d65f35..a14c7c8 100644
--- a/el10ar82.cfg
+++ b/el10ar82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('el10a.tpl')
 
-config_opts['root'] = 'el10a'
+config_opts['root'] = 'el10ar82'
 config_opts['resultdir'] = "/var/lib/mock/el10a"
 
 config_opts['module_enable'] = ['redis:remi-8.2']
diff --git a/el10xr82.cfg b/el10xr82.cfg
index c7e9d94..1fafe8f 100644
--- a/el10xr82.cfg
+++ b/el10xr82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('el10x.tpl')
 
-config_opts['root'] = 'el10x'
+config_opts['root'] = 'el10xr82'
 config_opts['resultdir'] = "/var/lib/mock/el10x"
 
 config_opts['module_enable'] = ['redis:remi-8.2']
diff --git a/el8ar82.cfg b/el8ar82.cfg
index 86d65a6..272859a 100644
--- a/el8ar82.cfg
+++ b/el8ar82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('el8a.tpl')
 
-config_opts['root'] = 'el8a'
+config_opts['root'] = 'el8ar82'
 config_opts['resultdir'] = "/var/lib/mock/el8a"
 
 config_opts['module_enable'] = ['redis:remi-8.2', 'varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14']
diff --git a/el8xr82.cfg b/el8xr82.cfg
index 3807447..1b8bfa8 100644
--- a/el8xr82.cfg
+++ b/el8xr82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('el8x.tpl')
 
-config_opts['root'] = 'el8x'
+config_opts['root'] = 'el8xr82'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
 config_opts['module_enable'] = ['redis:remi-8.2', 'varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14']
diff --git a/el9a.tpl b/el9a.tpl
index d350c7c..9edf4d2 100644
--- a/el9a.tpl
+++ b/el9a.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 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 epel-rpm-macros'
+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'] = 'el9'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '9'
diff --git a/el9ar82.cfg b/el9ar82.cfg
index e61e7c7..b3f27d7 100644
--- a/el9ar82.cfg
+++ b/el9ar82.cfg
@@ -2,8 +2,9 @@ import datetime;
 
 include('el9a.tpl')
 
-config_opts['root'] = 'el9a'
+config_opts['root'] = 'el9ar82'
 config_opts['resultdir'] = "/var/lib/mock/el9a"
+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 epel-rpm-macros'
 
 config_opts['module_enable'] = ['redis:remi-8.2']
 
diff --git a/el9x.tpl b/el9x.tpl
index 26871a3..2cb159f 100644
--- a/el9x.tpl
+++ b/el9x.tpl
@@ -2,7 +2,7 @@ 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 epel-rpm-macros'
+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'] = 'el9'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '9'
diff --git a/el9xr82.cfg b/el9xr82.cfg
index 19a1872..2228c75 100644
--- a/el9xr82.cfg
+++ b/el9xr82.cfg
@@ -2,8 +2,9 @@ import datetime;
 
 include('el9x.tpl')
 
-config_opts['root'] = 'el9x'
+config_opts['root'] = 'el9xr82'
 config_opts['resultdir'] = "/var/lib/mock/el9x"
+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 epel-rpm-macros'
 
 config_opts['module_enable'] = ['redis:remi-8.2']
 
diff --git a/fc41ar82.cfg b/fc41ar82.cfg
index c58acf6..5ba55db 100644
--- a/fc41ar82.cfg
+++ b/fc41ar82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('fc41a.tpl')
 
-config_opts['root'] = 'fc41a'
+config_opts['root'] = 'fc41ar82'
 config_opts['resultdir'] = "/var/lib/mock/fc41a"
 
 config_opts['module_enable'] = ['redis:remi-8.2']
diff --git a/fc41xr82.cfg b/fc41xr82.cfg
index cc43cc3..2858570 100644
--- a/fc41xr82.cfg
+++ b/fc41xr82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('fc41x.tpl')
 
-config_opts['root'] = 'fc41x'
+config_opts['root'] = 'fc41xr82'
 config_opts['resultdir'] = "/var/lib/mock/fc41x"
 
 config_opts['module_enable']  = ['redis:remi-8.2']
diff --git a/fc42ar82.cfg b/fc42ar82.cfg
index c52901f..4dfaf3e 100644
--- a/fc42ar82.cfg
+++ b/fc42ar82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('fc42a.tpl')
 
-config_opts['root'] = 'fc42a'
+config_opts['root'] = 'fc42ar82'
 config_opts['resultdir'] = "/var/lib/mock/fc42a"
 
 config_opts['module_enable'] = ['redis:remi-8.2']
diff --git a/fc42xr82.cfg b/fc42xr82.cfg
index d7d0060..4f0d459 100644
--- a/fc42xr82.cfg
+++ b/fc42xr82.cfg
@@ -2,7 +2,7 @@ import datetime;
 
 include('fc42x.tpl')
 
-config_opts['root'] = 'fc42x'
+config_opts['root'] = 'fc42xr82'
 config_opts['resultdir'] = "/var/lib/mock/fc42x"
 
 config_opts['module_enable'] = ['redis:remi-8.2']