Skip to content

Commit

Permalink
feat(mock-configs): i386 multilib support
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko committed Jul 19, 2024
1 parent d2e807b commit 99ccdf5
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 33 deletions.
5 changes: 0 additions & 5 deletions anda/terra/mock-configs/terra-38-aarch64.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions anda/terra/mock-configs/terra-38-x86_64.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions anda/terra/mock-configs/terra-39-i386.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '39'
config_opts['target_arch'] = 'i686'
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')

include('templates/terra.tpl')
5 changes: 5 additions & 0 deletions anda/terra/mock-configs/terra-40-i386.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '40'
config_opts['target_arch'] = 'i686'
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')

include('templates/terra.tpl')
46 changes: 23 additions & 23 deletions anda/terra/mock-configs/terra-mock-configs.spec
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
Name: terra-mock-configs
Version: 9
Version: 11
Release: 1%{?dist}
Summary: Mock configs for Terra repos

License: MIT
URL: https://terra.fyralabs.com
Source0: terra.tpl
Source1: terra-38-x86_64.cfg
Source2: terra-38-aarch64.cfg
Source3: terra-39-x86_64.cfg
Source4: terra-39-aarch64.cfg
Source5: terra-rawhide-x86_64.cfg
Source6: terra-rawhide-aarch64.cfg
Source5: terra-40-x86_64.cfg
Source6: terra-40-aarch64.cfg
Source7: terra-40-i386.cfg
Source8: terra-39-i386.cfg
Source9: terra-rawhide-x86_64.cfg
Source10: terra-rawhide-aarch64.cfg
Source11: terra-rawhide-i386.cfg

BuildRequires: mock-core-configs
Requires: mock-core-configs
Expand All @@ -32,35 +35,32 @@ Obsoletes: anda-mock-configs < 3-2%{?dist}
mkdir -p %{buildroot}%{_sysusersdir}
mkdir -p %{buildroot}%{_sysconfdir}/mock/templates


cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/
cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE7} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE8} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE9} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE10} %{buildroot}%{_sysconfdir}/mock/
cp -v %{SOURCE11} %{buildroot}%{_sysconfdir}/mock/

# For legacy compatibility, only while Terra 38 is still alive
ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl
ln -s %{_sysconfdir}/mock/terra-38-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-x86_64.cfg
ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-aarch64.cfg

%files
%config %{_sysconfdir}/mock/templates/terra.tpl
%config %{_sysconfdir}/mock/terra-rawhide-x86_64.cfg
%config %{_sysconfdir}/mock/terra-rawhide-aarch64.cfg
%config %{_sysconfdir}/mock/terra-39-x86_64.cfg
%config %{_sysconfdir}/mock/terra-39-aarch64.cfg
%config %{_sysconfdir}/mock/terra-38-x86_64.cfg
%config %{_sysconfdir}/mock/terra-38-aarch64.cfg
%config %{_sysconfdir}/mock/templates/anda.tpl
%config %{_sysconfdir}/mock/anda-38-x86_64.cfg
%config %{_sysconfdir}/mock/anda-38-aarch64.cfg
%config %{_sysconfdir}/mock/terra-*-x86_64.cfg
%config %{_sysconfdir}/mock/terra-*-aarch64.cfg
%config %{_sysconfdir}/mock/terra-*-i386.cfg


%changelog
* Mon Jan 15 2024 madonuko <[email protected]> - 9.1
- Update for Terra rawhide
* Wed Jul 18 2024 Cappy Ishihara <[email protected]> - 11-1
- Include multilib mock files for x86-based systems (backwards compatibility)

* Wed Jul 10 2024 madonuko <[email protected]> - 10-1
- Include mock files for Terra 40
- Remove mock files for Terra 38

* Mon Jan 08 2024 Lleyton Gray <[email protected]> - 7-1
- Bump ccache max size to 10G
Expand Down
5 changes: 5 additions & 0 deletions anda/terra/mock-configs/terra-rawhide-i386.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = 'rawhide'
config_opts['target_arch'] = 'i686'
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')

include('templates/terra.tpl')

0 comments on commit 99ccdf5

Please sign in to comment.