aboutsummaryrefslogtreecommitdiffstats
path: root/ulri
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-07 13:26:31 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-07 13:26:31 +0000
commit72d6945e459fc45db2eb2b834d43ac1b81f7a1d3 (patch)
tree2b4c77fab2056a2ca5d1953de36c03b130245264 /ulri
parent4cb04d7864faca4cbe845afacca68c76932b7470 (diff)
downloadiurt-72d6945e459fc45db2eb2b834d43ac1b81f7a1d3.tar
iurt-72d6945e459fc45db2eb2b834d43ac1b81f7a1d3.tar.gz
iurt-72d6945e459fc45db2eb2b834d43ac1b81f7a1d3.tar.bz2
iurt-72d6945e459fc45db2eb2b834d43ac1b81f7a1d3.tar.xz
iurt-72d6945e459fc45db2eb2b834d43ac1b81f7a1d3.zip
ulri: allow setting per distro arch
ulri currently takes the list of bots defined in $config->{bot} to find the list of architecture for which it should build packages. With this change, it is now possible to define in $config->{$arch} the list of architectures for each distro. If it is not defined for a distro, $config->{$arch}->{default} is used.
Diffstat (limited to 'ulri')
-rwxr-xr-xulri17
1 files changed, 16 insertions, 1 deletions
diff --git a/ulri b/ulri
index ec51ea7..9cc6d9e 100755
--- a/ulri
+++ b/ulri
@@ -152,6 +152,13 @@ my %config_usage = (
desc => 'Default packager tag user by bot',
default => 'Mageia Team <http://www.mageia.org>'
},
+ arch => {
+ desc => 'Architectures list for each target',
+ default => {
+ cauldron => [ 'i586', 'x86_64' ],
+ default => [ 'i586', 'x86_64' ],
+ },
+ },
);
config_usage(\%config_usage, $config) if $run{config_usage};
config_init(\%config_usage, $config, \%run);
@@ -535,8 +542,16 @@ foreach my $prefix (sort keys %pkg_tree) {
# count noarch todos only once even if searching multiple bots
my $noarch_countflag = 0;
+ my @arch_list = keys %{$config->{bot}};
+ if (ref $config->{arch} eq 'ARRAY') {
+ @arch_list = @{$config->{arch}};
+ } elsif (ref $config->{arch}->{$target} eq 'ARRAY') {
+ @arch_list = @{$config->{arch}->{$target}};
+ } elsif (ref $config->{arch}->{default} eq 'ARRAY') {
+ @arch_list = @{$config->{arch}->{default}};
+ }
# need to find a bot for each arch
- foreach my $arch (keys %{$config->{bot}}) {
+ foreach my $arch (@arch_list) {
# Skip this arch if package is building as noarch
#