Add fedora 31, remove fedora 28, use local build root instead of sharing with fedora

This commit is contained in:
Jason Rothstein 2019-09-22 14:11:19 -05:00
parent fc212bfff4
commit ed1fd7e8ab
7 changed files with 132 additions and 43 deletions

View File

@ -1,4 +1,4 @@
config_opts['root'] = 'fedora-29-i386'
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']

View File

@ -1,4 +1,4 @@
config_opts['root'] = 'fedora-29-x86_64'
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']

View File

@ -1,4 +1,4 @@
config_opts['root'] = 'fedora-30-i386'
config_opts['root'] = 'fdl-fedora-30-i386'
config_opts['target_arch'] = 'i686'
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
# config_opts['module_enable'] = ['list', 'of', 'modules']

View File

@ -1,4 +1,4 @@
config_opts['root'] = 'fedora-30-x86_64'
config_opts['root'] = 'fdl-fedora-30-x86_64'
config_opts['target_arch'] = 'x86_64'
config_opts['legal_host_arches'] = ('x86_64',)
# config_opts['module_enable'] = ['list', 'of', 'modules']

View File

@ -1,12 +1,14 @@
config_opts['root'] = 'fedora-28-i386'
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'] = 'fc28' # only useful for --resultdir variable subst
config_opts['dist'] = 'fc31' # only useful for --resultdir variable subst
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['releasever'] = '28'
config_opts['releasever'] = '31'
config_opts['package_manager'] = 'dnf'
config_opts['resultdir'] = '/var/www/html/packages/fedora/28/i386/'
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'
@ -25,22 +27,22 @@ syslog_ident=mock
syslog_device=
install_weak_deps=0
metadata_expire=0
mdpolicy=group:primary
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-28-primary
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-28-primary
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary
gpgcheck=1
skip_if_unavailable=False
@ -48,11 +50,13 @@ skip_if_unavailable=False
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/f28-build/latest/i386/
baseurl=https://kojipkgs.fedoraproject.org/repos/f31-build/latest/i386/
cost=2000
enabled=0
skip_if_unavailable=False
@ -61,36 +65,74 @@ skip_if_unavailable=False
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-28-primary
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
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-28-primary
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/

View File

@ -1,12 +1,14 @@
config_opts['root'] = 'fedora-28-x86_64'
config_opts['root'] = 'fdl-fedora-31-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'] = 'fc28' # only useful for --resultdir variable subst
config_opts['dist'] = 'fc31' # only useful for --resultdir variable subst
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['releasever'] = '28'
config_opts['releasever'] = '31'
config_opts['package_manager'] = 'dnf'
config_opts['resultdir'] = '/var/www/html/packages/fedora/28/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'
@ -25,22 +27,22 @@ syslog_ident=mock
syslog_device=
install_weak_deps=0
metadata_expire=0
mdpolicy=group:primary
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-28-primary
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-28-primary
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-31-primary
gpgcheck=1
skip_if_unavailable=False
@ -48,11 +50,13 @@ skip_if_unavailable=False
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/f28-build/latest/x86_64/
baseurl=https://kojipkgs.fedoraproject.org/repos/f31-build/latest/x86_64/
cost=2000
enabled=0
skip_if_unavailable=False
@ -61,36 +65,74 @@ skip_if_unavailable=False
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-28-primary
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
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-28-primary
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/

View File

@ -1,6 +1,6 @@
Name: fdragon-mock-configs
Version: 2019.07.04
Release: 3%{?dist}
Version: 2019.09.22
Release: 0%{?dist}
Summary: fdragon mock configs
License: GPLv3+
@ -10,12 +10,12 @@ 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-28-i386.cfg
Source7: fdl-fedora-28-x86_64.cfg
Source8: fdl-fedora-29-i386.cfg
Source9: fdl-fedora-29-x86_64.cfg
Source10: fdl-fedora-30-i386.cfg
Source11: fdl-fedora-30-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
Source100: makerepo
@ -65,12 +65,12 @@ rm -rf %{buildroot}
%{__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/28/i386/repodata
%{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/28/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/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
@ -87,12 +87,12 @@ ${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/28/i386/
${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/28/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/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/
@ -120,11 +120,6 @@ ${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/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/fedora
%dir %attr(2775,root,mock) /var/www/html/packages/fedora/28
%dir %attr(2775,root,mock) /var/www/html/packages/fedora/28/i386
%dir %attr(2775,root,mock) /var/www/html/packages/fedora/28/i386/repodata
%dir %attr(2775,root,mock) /var/www/html/packages/fedora/28/x86_64
%dir %attr(2775,root,mock) /var/www/html/packages/fedora/28/x86_64/repodata
%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
@ -135,6 +130,11 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/trixbox/2.8/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
@ -145,6 +145,11 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/trixbox/2.8/i386/
%changelog
* Sun Sep 22 2019 Jason Rothstein <fdragon@fdragon.org>
- remove fedora 28
- add fedora 31
- local packages use dedicated root instead of the fedora root
* Thu Jul 04 2019 Jason Rothstein <fdragon@fdragon.org>
- Add createrepo dependency
- Add makerepo hourly cron job