From b0888def7fb764455ee21c3d08acb4e15069c67c Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Thu, 29 Nov 2012 16:03:04 +0800 Subject: [PATCH] Add archpolicies for supporting more x86 and arm archs Change-Id: I7e22b8ec623316fbc2403187ee0e6deee93c71b0 --- depanneur | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/depanneur b/depanneur index a8c0219..b652927 100755 --- a/depanneur +++ b/depanneur @@ -400,23 +400,33 @@ mkdir_p($srpm_repo_path); my @packs; my $package_path = ""; -# FIXME - -my @arm_archs = ( "armv7el" , "armv7l", "noarch"); -my @ix86_archs = ("i386", "i586", "i686", "noarch"); -my @ix86_64_archs = ("i386", "i586", "i686", "x86_64", "noarch"); -my @archs = (); -if ( $arch eq "i586" ) { - @archs = @ix86_archs; -} elsif ( $arch eq "x86_64" ) { - @archs = @ix86_64_archs; -} else { - @archs = @arm_archs; -} -my $archpath; -foreach my $ap (@archs) { - $archpath .= $ap.":"; -} + +# This arch policy comes from sat-solver:src/poolarch.c +my %archpolicies = ( + "x86_64" => ["x86_64", "i686", "i586", "i486", "i386", "noarch"], + "i686" => ["i686", "i586", "i486", "i386", "noarch"], + "i586" => ["i586", "i486", "i386", "noarch"], + "i486" => ["i486", "i386", "noarch"], + "i386" => ["i386", "noarch"], + "ia64" => ["ia64", "i686", "i586", "i486", "i386", "noarch"], + "armv7tnhl" => ["arvm7tnhl", "armv7thl", "armv7nhl", "armv7hl", "noarch"], + "armv7thl" => ["armv7thl", "armv7hl", "noarch"], + "armv7nhl" => ["armv7nhl", "armv7hl", "noarch"], + "armv7hl" => ["armv7hl", "noarch"], + "armv7l" => ["armv7l", "armv7el", "armv6l", "armv5tejl", "armv5tel", "armv5l", "armv4tl", "armv4l", "armv3l", "noarch"], + "armv6l" => ["armv6l", "armv5tejl", "armv5tel", "armv5l", "armv4tl", "armv4l", "armv3l", "noarch"], + "armv5tejl" => ["armv5tejl", "armv5tel", "armv5l", "armv4tl", "armv4l", "armv3l", "noarch"], + "armv5tel" => ["armv5tel", "armv5l", "armv4tl", "armv4l", "armv3l", "noarch"], + "armv5l" => ["armv5l", "armv4tl", "armv4l", "armv3l", "noarch"], + "armv4tl" => ["armv4tl", "armv4l", "armv3l", "noarch"], + "armv4l" => ["armv4l", "armv3l", "noarch"], + ); + +error("$arch not support") if (not exists $archpolicies{$arch}); + +my @archs = @{$archpolicies{$arch}}; +my $archpath = join(":", @archs); + my $config = Build::read_config_dist($dist, $archpath, $dist_configs); if ( -d "$packaging_dir" && -d ".git" ) { -- 2.34.1