From 68c5c131f886dda2470e24e1c0d9dbd62c35088e Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 2 Nov 2019 23:03:47 -0500 Subject: [PATCH] Remove epel 5, fedora 29, fedora 31 i386, add epel 8, use template for fedora 30+ --- fdl-epel-5-i386.cfg | 79 -------------------- fdl-epel-5-x86_64.cfg | 79 -------------------- fdl-epel-8-x86_64.cfg | 29 ++++++++ fdl-fedora-29-i386.cfg | 145 ------------------------------------ fdl-fedora-29-x86_64.cfg | 145 ------------------------------------ fdl-fedora-30-i386.cfg | 138 ++-------------------------------- fdl-fedora-30-x86_64.cfg | 138 ++-------------------------------- fdl-fedora-31-i386.cfg | 152 -------------------------------------- fdl-fedora-31-x86_64.cfg | 138 ++-------------------------------- fdl-trixbox-2.6-i386.cfg | 93 ----------------------- fdl-trixbox-2.8-i386.cfg | 93 ----------------------- fdragon-mock-configs.spec | 76 ++++++------------- makerepo | 9 +-- 13 files changed, 73 insertions(+), 1241 deletions(-) delete mode 100644 fdl-epel-5-i386.cfg delete mode 100644 fdl-epel-5-x86_64.cfg create mode 100644 fdl-epel-8-x86_64.cfg delete mode 100644 fdl-fedora-29-i386.cfg delete mode 100644 fdl-fedora-29-x86_64.cfg delete mode 100644 fdl-fedora-31-i386.cfg delete mode 100644 fdl-trixbox-2.6-i386.cfg delete mode 100644 fdl-trixbox-2.8-i386.cfg diff --git a/fdl-epel-5-i386.cfg b/fdl-epel-5-i386.cfg deleted file mode 100644 index 5bc57f5..0000000 --- a/fdl-epel-5-i386.cfg +++ /dev/null @@ -1,79 +0,0 @@ -# epel5 is EOLed, neither updates nor fixes are released -config_opts['root'] = 'fdl-epel-5-i386' -config_opts['target_arch'] = 'i386' -config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -config_opts['chroot_setup_cmd'] = 'install buildsys-build buildsys-macros' -config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -if 'macros' not in config_opts: config_opts['macros'] = {} -config_opts['macros']['%__arch_install_post'] = '%{nil}' -# beware: RHEL uses 5Server or 5Client -config_opts['releasever'] = '5' -config_opts['resultdir'] = '/var/www/html/packages/epel/5/i386/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -config_opts['yum.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -logfile=/var/log/yum.log -reposdir=/dev/null -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -mdpolicy=group:primary -best=1 - -# repos - -[core] -name=base -baseurl=http://vault.centos.org/5.11/os/i386/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[update] -name=updates -baseurl=http://vault.centos.org/5.11/updates/i386/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[groups] -name=groups -baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel5/i386/ - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=i386 -gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-5 -gpgcheck=1 -skip_if_unavailable=False - -[epel-debuginfo] -name=epel-debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=i386 -failovermethod=priority -enabled=0 -skip_if_unavailable=False - -[fdl-epel-local] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://local/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-epel-remote] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://fdragon.org/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -""" diff --git a/fdl-epel-5-x86_64.cfg b/fdl-epel-5-x86_64.cfg deleted file mode 100644 index 6d9a399..0000000 --- a/fdl-epel-5-x86_64.cfg +++ /dev/null @@ -1,79 +0,0 @@ -# epel5 is EOLed, neither updates nor fixes are released -config_opts['root'] = 'epel-5-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install buildsys-build buildsys-macros' -config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -if 'macros' not in config_opts: config_opts['macros'] = {} -config_opts['macros']['%__arch_install_post'] = '%{nil}' -# beware: RHEL uses 5Server or 5Client -config_opts['releasever'] = '5' -config_opts['resultdir'] = '/var/www/html/packages/epel/5/x86_64/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -config_opts['yum.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -logfile=/var/log/yum.log -reposdir=/dev/null -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -mdpolicy=group:primary -best=1 - -# repos - -[core] -name=base -baseurl=http://vault.centos.org/5.11/os/x86_64/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[update] -name=updates -baseurl=http://vault.centos.org/5.11/updates/x86_64/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[groups] -name=groups -baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel5/x86_64/ - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=x86_64 -gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-5 -gpgcheck=1 -skip_if_unavailable=False - -[epel-debuginfo] -name=epel-debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=x86_64 -failovermethod=priority -enabled=0 -skip_if_unavailable=False - -[fdl-epel-local] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://local/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-epel-remote] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://fdragon.org/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -""" diff --git a/fdl-epel-8-x86_64.cfg b/fdl-epel-8-x86_64.cfg new file mode 100644 index 0000000..b83035d --- /dev/null +++ b/fdl-epel-8-x86_64.cfg @@ -0,0 +1,29 @@ +include('/etc/mock/templates/centos-8.tpl') +include('/etc/mock/templates/epel-8.tpl') + +config_opts['root'] = 'fdl-epel-8-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) + +config_opts['resultdir'] = '/var/www/html/packages/epel/8/x86_64/' +config_opts['createrepo_on_rpms'] = True +config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' + +config_opts['yum.conf'] += """ + +[fdl-epel-local] +name=Fire Dragon Linux packages for epel $releasever - $basearch +baseurl=http://local/packages/epel/$releasever/$basearch/ +failovermethod=roundrobin +enabled=1 +gpgcheck=0 + +[fdl-epel-remote] +name=Fire Dragon Linux packages for epel $releasever - $basearch +baseurl=http://fdragon.org/packages/epel/$releasever/$basearch/ +failovermethod=roundrobin +enabled=1 +gpgcheck=0 + +""" + diff --git a/fdl-fedora-29-i386.cfg b/fdl-fedora-29-i386.cfg deleted file mode 100644 index a3a26ae..0000000 --- a/fdl-fedora-29-i386.cfg +++ /dev/null @@ -1,145 +0,0 @@ -config_opts['root'] = 'fdl-fedora-29-i386' -config_opts['target_arch'] = 'i686' -config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['dist'] = 'fc29' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '29' -config_opts['package_manager'] = 'dnf' -config_opts['resultdir'] = '/var/www/html/packages/fedora/29/i386/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -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 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -mdpolicy=group:primary -best=1 -module_platform_id=platform:f29 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates] -name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing] -name=updates-testing -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/f29-build/latest/i386/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=fedora-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[updates-debuginfo] -name=updates-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -[updates-source] -name=updates-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[fedora-modular] -name=Fedora Modular $releasever - $basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fdl-fedora-local] -name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://localhost/packages/fedora/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 -skip_if_unavailable=True - -[fdl-fedora-remote] -name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 -skip_if_unavailable=True - -""" diff --git a/fdl-fedora-29-x86_64.cfg b/fdl-fedora-29-x86_64.cfg deleted file mode 100644 index 4238eb3..0000000 --- a/fdl-fedora-29-x86_64.cfg +++ /dev/null @@ -1,145 +0,0 @@ -config_opts['root'] = 'fdl-fedora-29-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['dist'] = 'fc29' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '29' -config_opts['package_manager'] = 'dnf' -config_opts['resultdir'] = '/var/www/html/packages/fedora/29/x86_64/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -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 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -mdpolicy=group:primary -best=1 -module_platform_id=platform:f29 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates] -name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing] -name=updates-testing -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/f29-build/latest/x86_64/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=fedora-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[updates-debuginfo] -name=updates-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -[updates-source] -name=updates-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-29-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[fedora-modular] -name=Fedora Modular $releasever - $basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fdl-fedora-local] -name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://localhost/packages/fedora/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 -skip_if_unavailable=True - -[fdl-fedora-remote] -name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 -skip_if_unavailable=True - -""" diff --git a/fdl-fedora-30-i386.cfg b/fdl-fedora-30-i386.cfg index c5e3144..c01cb55 100644 --- a/fdl-fedora-30-i386.cfg +++ b/fdl-fedora-30-i386.cfg @@ -1,145 +1,21 @@ -config_opts['root'] = 'fdl-fedora-30-i386' +include('/etc/mock/templates/fedora-30.tpl') + config_opts['target_arch'] = 'i686' config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['dist'] = 'fc30' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '30' -config_opts['package_manager'] = 'dnf' + +config_opts['root'] = 'fdl-fedora-30-i386' config_opts['resultdir'] = '/var/www/html/packages/fedora/30/i386/' config_opts['createrepo_on_rpms'] = True config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - -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 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -best=1 -module_platform_id=platform:f30 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates] -name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing] -name=updates-testing -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/f30-build/latest/i386/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=fedora-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-debuginfo] -name=updates-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -[updates-source] -name=updates-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[fedora-modular] -name=Fedora Modular $releasever - $basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False +config_opts['yum.conf'] += """ [fdl-fedora-local] name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://localhost/packages/fedora/$releasever/$basearch/ +baseurl=http://local/packages/fedora/$releasever/$basearch/ failovermethod=roundrobin enabled=1 gpgcheck=0 -skip_if_unavailable=True [fdl-fedora-remote] name=Fire Dragon Linux packages for fedora $releasever - $basearch @@ -147,6 +23,6 @@ baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/ failovermethod=roundrobin enabled=1 gpgcheck=0 -skip_if_unavailable=True """ + diff --git a/fdl-fedora-30-x86_64.cfg b/fdl-fedora-30-x86_64.cfg index f655ec7..3a7851a 100644 --- a/fdl-fedora-30-x86_64.cfg +++ b/fdl-fedora-30-x86_64.cfg @@ -1,145 +1,21 @@ -config_opts['root'] = 'fdl-fedora-30-x86_64' +include('/etc/mock/templates/fedora-30.tpl') + config_opts['target_arch'] = 'x86_64' config_opts['legal_host_arches'] = ('x86_64',) -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['dist'] = 'fc30' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '30' -config_opts['package_manager'] = 'dnf' + +config_opts['root'] = 'fdl-fedora-30-x86_64' config_opts['resultdir'] = '/var/www/html/packages/fedora/30/x86_64/' config_opts['createrepo_on_rpms'] = True config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - -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 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -best=1 -module_platform_id=platform:f30 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates] -name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing] -name=updates-testing -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/f30-build/latest/x86_64/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=fedora-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-debuginfo] -name=updates-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -[updates-source] -name=updates-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[fedora-modular] -name=Fedora Modular $releasever - $basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False +config_opts['yum.conf'] += """ [fdl-fedora-local] name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://localhost/packages/fedora/$releasever/$basearch/ +baseurl=http://local/packages/fedora/$releasever/$basearch/ failovermethod=roundrobin enabled=1 gpgcheck=0 -skip_if_unavailable=True [fdl-fedora-remote] name=Fire Dragon Linux packages for fedora $releasever - $basearch @@ -147,6 +23,6 @@ baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/ failovermethod=roundrobin enabled=1 gpgcheck=0 -skip_if_unavailable=True """ + diff --git a/fdl-fedora-31-i386.cfg b/fdl-fedora-31-i386.cfg deleted file mode 100644 index dc54ed1..0000000 --- a/fdl-fedora-31-i386.cfg +++ /dev/null @@ -1,152 +0,0 @@ -config_opts['root'] = 'fdl-fedora-31-i386' -config_opts['target_arch'] = 'i686' -config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -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['resultdir'] = '/var/www/html/packages/fedora/31/i386/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -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 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -best=1 -module_platform_id=platform:f31 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates] -name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing] -name=updates-testing -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/f31-build/latest/i386/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=fedora-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-debuginfo] -name=updates-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -[updates-source] -name=updates-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[fedora-modular] -name=Fedora Modular $releasever - $basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fdl-fedora-local] -name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://localhost/packages/fedora/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 -skip_if_unavailable=True - -[fdl-fedora-remote] -name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 -skip_if_unavailable=True - -""" diff --git a/fdl-fedora-31-x86_64.cfg b/fdl-fedora-31-x86_64.cfg index ddfc723..6f1f7b7 100644 --- a/fdl-fedora-31-x86_64.cfg +++ b/fdl-fedora-31-x86_64.cfg @@ -1,145 +1,21 @@ -config_opts['root'] = 'fdl-fedora-31-x86_64' +include('/etc/mock/templates/fedora-31.tpl') + config_opts['target_arch'] = 'x86_64' config_opts['legal_host_arches'] = ('x86_64',) -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -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['root'] = 'fdl-fedora-31-x86_64' config_opts['resultdir'] = '/var/www/html/packages/fedora/31/x86_64/' config_opts['createrepo_on_rpms'] = True config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - -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 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -best=1 -module_platform_id=platform:f31 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates] -name=updates -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing] -name=updates-testing -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/f31-build/latest/x86_64/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=fedora-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-debuginfo] -name=updates-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -[updates-source] -name=updates-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[fedora-modular] -name=Fedora Modular $releasever - $basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -skip_if_unavailable=False +config_opts['yum.conf'] += """ [fdl-fedora-local] name=Fire Dragon Linux packages for fedora $releasever - $basearch -baseurl=http://localhost/packages/fedora/$releasever/$basearch/ +baseurl=http://local/packages/fedora/$releasever/$basearch/ failovermethod=roundrobin enabled=1 gpgcheck=0 -skip_if_unavailable=True [fdl-fedora-remote] name=Fire Dragon Linux packages for fedora $releasever - $basearch @@ -147,6 +23,6 @@ baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/ failovermethod=roundrobin enabled=1 gpgcheck=0 -skip_if_unavailable=True """ + diff --git a/fdl-trixbox-2.6-i386.cfg b/fdl-trixbox-2.6-i386.cfg deleted file mode 100644 index 6c031bb..0000000 --- a/fdl-trixbox-2.6-i386.cfg +++ /dev/null @@ -1,93 +0,0 @@ -# epel5 is EOLed, neither updates nor fixes are released -config_opts['root'] = 'fdl-trixbox-2.6-i386' -config_opts['target_arch'] = 'i386' -config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -config_opts['chroot_setup_cmd'] = 'install buildsys-build buildsys-macros' -config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -if 'macros' not in config_opts: config_opts['macros'] = {} -config_opts['macros']['%__arch_install_post'] = '%{nil}' -# beware: RHEL uses 5Server or 5Client -config_opts['releasever'] = '5' -config_opts['resultdir'] = '/var/www/html/packages/trixbox/2.6/i386/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -config_opts['yum.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -logfile=/var/log/yum.log -reposdir=/dev/null -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -mdpolicy=group:primary -best=1 - -# repos - -[core] -name=base -baseurl=http://vault.centos.org/5.11/os/i386/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[update] -name=updates -baseurl=http://vault.centos.org/5.11/updates/i386/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[groups] -name=groups -baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel5/i386/ - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=i386 -gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-5 -gpgcheck=1 -skip_if_unavailable=False - -[epel-debuginfo] -name=epel-debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=i386 -failovermethod=priority -enabled=0 -skip_if_unavailable=False - -[fdl-epel-local] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://local/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-epel-remote] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://fdragon.org/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-trixbox-local] -name=Fire Dragon Linux packages for trixbox 2.6 - $basearch -baseurl=http://local/packages/trixbox/2.6/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-trixbox-remote] -name=Fire Dragon Linux packages for trixbox 2.6 - $basearch -baseurl=http://fdragon.org/packages/trixbox/2.6/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -""" diff --git a/fdl-trixbox-2.8-i386.cfg b/fdl-trixbox-2.8-i386.cfg deleted file mode 100644 index 490b194..0000000 --- a/fdl-trixbox-2.8-i386.cfg +++ /dev/null @@ -1,93 +0,0 @@ -# epel5 is EOLed, neither updates nor fixes are released -config_opts['root'] = 'fdl-trixbox-2.8-i386' -config_opts['target_arch'] = 'i386' -config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -config_opts['chroot_setup_cmd'] = 'install buildsys-build buildsys-macros' -config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -if 'macros' not in config_opts: config_opts['macros'] = {} -config_opts['macros']['%__arch_install_post'] = '%{nil}' -# beware: RHEL uses 5Server or 5Client -config_opts['releasever'] = '5' -config_opts['resultdir'] = '/var/www/html/packages/trixbox/2.8/i386/' -config_opts['createrepo_on_rpms'] = True -config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm' - - -config_opts['yum.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -logfile=/var/log/yum.log -reposdir=/dev/null -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -mdpolicy=group:primary -best=1 - -# repos - -[core] -name=base -baseurl=http://vault.centos.org/5.11/os/i386/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[update] -name=updates -baseurl=http://vault.centos.org/5.11/updates/i386/ -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-5 -gpgcheck=1 -skip_if_unavailable=False - -[groups] -name=groups -baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel5/i386/ - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=i386 -gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-5 -gpgcheck=1 -skip_if_unavailable=False - -[epel-debuginfo] -name=epel-debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=i386 -failovermethod=priority -enabled=0 -skip_if_unavailable=False - -[fdl-epel-local] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://local/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-epel-remote] -name=Fire Dragon Linux packages for epel $releasever - $basearch -baseurl=http://fdragon.org/packages/epel/$releasever/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-trixbox-local] -name=Fire Dragon Linux packages for trixbox 2.8 - $basearch -baseurl=http://local/packages/trixbox/2.8/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -[fdl-trixbox-remote] -name=Fire Dragon Linux packages for trixbox 2.8 - $basearch -baseurl=http://fdragon.org/packages/trixbox/2.8/$basearch/ -failovermethod=roundrobin -enabled=1 -gpgcheck=0 - -""" diff --git a/fdragon-mock-configs.spec b/fdragon-mock-configs.spec index 996b672..434ce8c 100644 --- a/fdragon-mock-configs.spec +++ b/fdragon-mock-configs.spec @@ -1,23 +1,17 @@ Name: fdragon-mock-configs -Version: 2019.09.22 -Release: 0%{?dist} +Version: 2019.11.02 +Release: 1%{?dist} Summary: fdragon mock configs License: GPLv3+ URL: http://fdragon.org -Source1: fdl-epel-5-i386.cfg -Source2: fdl-epel-5-x86_64.cfg -Source3: fdl-epel-6-i386.cfg -Source4: fdl-epel-6-x86_64.cfg -Source5: fdl-epel-7-x86_64.cfg -Source6: fdl-fedora-29-i386.cfg -Source7: fdl-fedora-29-x86_64.cfg -Source8: fdl-fedora-30-i386.cfg -Source9: fdl-fedora-30-x86_64.cfg -Source10: fdl-fedora-31-i386.cfg -Source11: fdl-fedora-31-x86_64.cfg -Source12: fdl-trixbox-2.6-i386.cfg -Source13: fdl-trixbox-2.8-i386.cfg +Source1: fdl-epel-6-i386.cfg +Source2: fdl-epel-6-x86_64.cfg +Source3: fdl-epel-7-x86_64.cfg +Source4: fdl-epel-8-x86_64.cfg +Source5: fdl-fedora-30-i386.cfg +Source6: fdl-fedora-30-x86_64.cfg +Source7: fdl-fedora-31-x86_64.cfg Source100: makerepo # BuildRequires: @@ -53,26 +47,14 @@ rm -rf %{buildroot} %{__install} %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/ %{__install} %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/ %{__install} %{SOURCE7} %{buildroot}%{_sysconfdir}/mock/ -%{__install} %{SOURCE8} %{buildroot}%{_sysconfdir}/mock/ -%{__install} %{SOURCE9} %{buildroot}%{_sysconfdir}/mock/ -%{__install} %{SOURCE10} %{buildroot}%{_sysconfdir}/mock/ -%{__install} %{SOURCE11} %{buildroot}%{_sysconfdir}/mock/ -%{__install} %{SOURCE12} %{buildroot}%{_sysconfdir}/mock/ -%{__install} %{SOURCE13} %{buildroot}%{_sysconfdir}/mock/ %{__install} %{SOURCE100} %{buildroot}%{_sysconfdir}/cron.hourly/ -%{__mkdir_p} %{buildroot}/var/www/html/packages/epel/5/i386/repodata -%{__mkdir_p} %{buildroot}/var/www/html/packages/epel/5/x86_64/repodata %{__mkdir_p} %{buildroot}/var/www/html/packages/epel/6/i386/repodata %{__mkdir_p} %{buildroot}/var/www/html/packages/epel/6/x86_64/repodata %{__mkdir_p} %{buildroot}/var/www/html/packages/epel/7/x86_64/repodata -%{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/29/i386/repodata -%{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/29/x86_64/repodata +%{__mkdir_p} %{buildroot}/var/www/html/packages/epel/8/x86_64/repodata %{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/30/i386/repodata %{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/30/x86_64/repodata -%{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/31/i386/repodata %{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/31/x86_64/repodata -%{__mkdir_p} %{buildroot}/var/www/html/packages/trixbox/2.6/i386/repodata -%{__mkdir_p} %{buildroot}/var/www/html/packages/trixbox/2.8/i386/repodata %post @@ -82,19 +64,13 @@ then else CREATEREPO=/usr/bin/createrepo fi -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/5/i386/ -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/5/x86_64/ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/6/i386/ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/6/x86_64/ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/7/x86_64/ -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/29/i386/ -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/29/x86_64/ +${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/8/x86_64/ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/30/i386/ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/30/x86_64/ -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/31/i386/ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/31/x86_64/ -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/trixbox/2.6/i386/ -${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/trixbox/2.8/i386/ %files @@ -106,11 +82,6 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/trixbox/2.8/i386/ %dir %attr(2775,root,mock) /var/www/html/packages %dir %attr(2775,root,mock) /var/www/html/packages/epel -%dir %attr(2775,root,mock) /var/www/html/packages/epel/5 -%dir %attr(2775,root,mock) /var/www/html/packages/epel/5/i386 -%dir %attr(2775,root,mock) /var/www/html/packages/epel/5/i386/repodata -%dir %attr(2775,root,mock) /var/www/html/packages/epel/5/x86_64 -%dir %attr(2775,root,mock) /var/www/html/packages/epel/5/x86_64/repodata %dir %attr(2775,root,mock) /var/www/html/packages/epel/6 %dir %attr(2775,root,mock) /var/www/html/packages/epel/6/i386 %dir %attr(2775,root,mock) /var/www/html/packages/epel/6/i386/repodata @@ -119,32 +90,29 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/trixbox/2.8/i386/ %dir %attr(2775,root,mock) /var/www/html/packages/epel/7 %dir %attr(2775,root,mock) /var/www/html/packages/epel/7/x86_64 %dir %attr(2775,root,mock) /var/www/html/packages/epel/7/x86_64/repodata +%dir %attr(2775,root,mock) /var/www/html/packages/epel/8 +%dir %attr(2775,root,mock) /var/www/html/packages/epel/8/x86_64 +%dir %attr(2775,root,mock) /var/www/html/packages/epel/8/x86_64/repodata %dir %attr(2775,root,mock) /var/www/html/packages/fedora -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/29 -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/29/i386 -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/29/i386/repodata -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/29/x86_64 -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/29/x86_64/repodata %dir %attr(2775,root,mock) /var/www/html/packages/fedora/30 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/30/i386 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/30/i386/repodata %dir %attr(2775,root,mock) /var/www/html/packages/fedora/30/x86_64 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/30/x86_64/repodata %dir %attr(2775,root,mock) /var/www/html/packages/fedora/31 -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/31/i386 -%dir %attr(2775,root,mock) /var/www/html/packages/fedora/31/i386/repodata %dir %attr(2775,root,mock) /var/www/html/packages/fedora/31/x86_64 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/31/x86_64/repodata -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox/2.6 -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox/2.6/i386 -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox/2.6/i386/repodata -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox/2.8 -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox/2.8/i386 -%dir %attr(2775,root,mock) /var/www/html/packages/trixbox/2.8/i386/repodata %changelog +* Sat Nov 2 2019 Jason Rothstein +- remove epel 5 +- remove trixbox 2.6/2.8 +- remove fedora 29 +- remove fedora 31 i386 +- add epel 8 +- convert fedora 30/31 to templates like upstream + * Sun Sep 22 2019 Jason Rothstein - remove fedora 28 - add fedora 31 diff --git a/makerepo b/makerepo index ff6913c..65f6e56 100644 --- a/makerepo +++ b/makerepo @@ -30,14 +30,7 @@ BASE_DIR=/var/www/html/packages then ( cd ${architecture} - case ${target}-${version}-${architecture} in - epel-5-*|trixbox-*-*) - nice ${CREATEREPO} --checksum=sha --database --quiet . - ;; - *) - nice ${CREATEREPO} --database --quiet . - ;; - esac + nice ${CREATEREPO} --database --quiet . ) fi done