funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: multilib for x86 (#1549)

Browse Source 
* feat: multilib for x86

* feat: Build i686 for x86 targets if multilib
This commit is contained in:
Cappy Ishihara
2024-07-19 11:23:14 +07:00
committed by GitHub
parent e50a00c326
commit e8e046121a
5 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/autobuild.yml
+5
View File
@@ -60,6 +60,11 @@ jobs:
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
- name: Build with Andaman (alternate arch)
if: |
matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-i386.cfg
- name: Generating artifact name
id: art
anda/terra/mock-configs/terra-39-i386.cfg
+5
View File
@@ -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')
anda/terra/mock-configs/terra-40-i386.cfg
+5
View File
@@ -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')
anda/terra/mock-configs/terra-mock-configs.spec
+15 -1
View File
@@ -1,5 +1,5 @@
Name: terra-mock-configs
Version: 10
Version: 11
Release: 1%{?dist}
Summary: Mock configs for Terra repos
@@ -10,6 +10,11 @@ Source3: terra-39-x86_64.cfg
Source4: terra-39-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
@@ -35,15 +40,24 @@ 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/
%files
%config %{_sysconfdir}/mock/templates/terra.tpl
%config %{_sysconfdir}/mock/terra-*-x86_64.cfg
%config %{_sysconfdir}/mock/terra-*-aarch64.cfg
%config %{_sysconfdir}/mock/terra-*-i386.cfg
%changelog
* Wed Jul 18 2024 Cappy Ishihara <cappy@fyralabs.com> - 11-1
- Include multilib mock files for x86-based systems (backwards compatibility)
* Wed Jul 10 2024 madonuko <mado@fyralabs.com> - 10-1
- Include mock files for Terra 40
- Remove mock files for Terra 38
anda/terra/mock-configs/terra-rawhide-i386.cfg
+5
View File
@@ -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')