diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-01-09 00:47:52 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-01-09 00:50:30 +0000 |
| commit | 7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0 (patch) | |
| tree | 71e3b7255f67358c5390e050f74a9e0e2b3c8b40 | |
| parent | fd2252719ebf17ec80617a05ae9d585d016ef368 (diff) | |
| download | puppet-7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0.tar puppet-7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0.tar.gz puppet-7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0.tar.bz2 puppet-7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0.tar.xz puppet-7c2ceb00a232fa8db657680bbdc7b92ddb8fb8e0.zip | |
Allow armv7hl builds on EC2 machines
The __isa is still armel-32 instead of armv7hl-32 when building on
aarch64 so for now there is a local change on duvel in
/usr/share/perl5/vendor_perl/Iurt/Ulri.pm to force it by adding
"--rpmmacros '%__isa_name armv7hl'" to iurt call when building for
armv7hl.
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 0bb8a696..ba484692 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -29,7 +29,7 @@ class mga_buildsystem::config { 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ], 'armv5tl' => [ 'armlet3', 'armlet5' ], - 'armv7hl' => [ 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ], + 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ], 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'scwaarch641', 'scwaarch643', 'scwaarch642', 'scwaarch644' ], }, build_nodes_aliases => { |