cleanup EL6 configuration files

1 files changed, 8 insertions, 29 deletions

diff --git a/el6xscl54.cfg b/el6xscl54.cfg
index 9ea0a48..9e8e1e9 100644
--- a/el6xscl54.cfg
+++ b/el6xscl54.cfg
@@ -1,32 +1,11 @@
-config_opts['root'] = 'scl54el6x'
-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['use_nspawn'] = False
-
-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/"
+include('el6x.tpl')
 
-config_opts['basedir'] = '/dev/shm/'
+config_opts['root'] = 'scl54el6x'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php54-build'
 config_opts['resultdir'] = "/var/lib/mock/scl54el6x"
-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']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
-config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".el6.remi"
-config_opts['macros']['%rhel']="6"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%runselftest']="1"
 config_opts['macros']['%nophptag']="1"
 
 config_opts['yum.conf'] = """
@@ -45,7 +24,7 @@ syslog_device=
 # repos
 [rhel-6]
 name=rhel-6
-baseurl=file:/mnt/rhel-6-x86_64/
+baseurl=file:///mnt/rhel-6-x86_64/
 enabled=1
 
 [beta]
@@ -85,17 +64,17 @@ failovermethod=priority
 
 [remi]
 name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/6/remi/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/6/remi/x86_64/
 enabled=1
 
 [remi-test]
 name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/6/test/x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/enterprise/6/test/x86_64/
 enabled=0
 
 [remi-priv]
 name=remi prive
-baseurl=file:/home/rpmbuild/site/rpms/priv/el6.x86_64/
+baseurl=file:///home/rpmbuild/site/rpms/priv/el6.x86_64/
 exclude=oracle*12.2* oracle*18* oracle*19*
 enabled=1
 
@@ -117,7 +96,7 @@ enabled=0
 
 [result]
 name=result
-baseurl=file:/var/lib/mock/scl54el6x/
+baseurl=file:///var/lib/mock/scl54el6x/
 enabled=1
 
 """