cleanup f31 config

1 files changed, 3 insertions, 115 deletions

diff --git a/fc31xr.cfg b/fc31xr.cfg
index 1ba14ed..10d60c2 100644
--- a/fc31xr.cfg
+++ b/fc31xr.cfg
@@ -1,107 +1,6 @@
-config_opts['root'] = 'fc31x'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'fc31'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '31'
-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.fc31x/"
-
-config_opts['basedir'] = '/dev/shm/'
-config_opts['resultdir'] = "/var/lib/mock/fc31x"
-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 Collet"
-config_opts['macros']['%packager']="https://blog.remirepo.net/"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
-config_opts['macros']['%dist']=".fc31.remi"
-config_opts['macros']['%fedora']="31"
-config_opts['macros']['%_with_ibase']="1"
-config_opts['macros']['%_with_oci8']="1"
-config_opts['macros']['%_with_rpmfusion']="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
-failovermethod=priority
-metadata_expire=80000
-##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-31&arch=x86_64
-#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/31/Everything/x86_64/os/
-#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/31/Everything/x86_64/os/
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&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/31/x86_64/
-#	http://fr2.rpmfind.net/linux/fedora/updates/31/x86_64/
-enabled=1
-	
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f31&arch=x86_64
-#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/31/x86_64/
-enabled=0
-
-[remi]
-name=remi public
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/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-test]
-name=remi test
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/test/x86_64/
-enabled=0
-
-[remi-debuginfo]
-name=remi-debuginfo
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/debug-remi/x86_64/
-enabled=1
-
-[remi-dev]
-name=remi dev
-baseurl=file:/home/rpmbuild/site/rpms/fedora/31/devs/x86_64/
-enabled=0
+include('fc31x.tpl')
 
+config_opts['yum.conf'] += """
 [rpmfusion-free]
 name=rpmfusion-free
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-31&arch=x86_64
@@ -110,7 +9,7 @@ enabled=1
 [rpmfusion-free-updates]
 name=rpmfusion-free-updates
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-31&arch=x86_64
-enabled=0
+enabled=1
 
 [rpmfusion-nonfree]
 name=rpmfusion-nonfree
@@ -122,15 +21,4 @@ name=rpmfusion-nonfree
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-31&arch=x86_64
 enabled=0
 
-[result-fc31x]
-name=result-fc31x
-baseurl=file:/var/lib/mock/fc31x/
-metadata_expire=10
-enabled=1
-
-[msprod]
-name=msprod
-baseurl=https://packages.microsoft.com/rhel/7/prod/
-enabled=1
-
 """