diff options
author | Charles Baylis <charles.baylis@linaro.org> | 2017-06-26 08:53:43 +0000 |
---|---|---|
committer | Charles Baylis <charles.baylis@linaro.org> | 2017-06-27 17:39:04 +0000 |
commit | db771acc375ae43d1ac0315c6c982af732283d26 (patch) | |
tree | 1876f8774915b57b97d256b20bf7a003a81c4e50 /validate-manifest.pl | |
parent | a1bf888ba7956627b17b52f423ec5d23df17a33b (diff) |
validate-manifest.pl: Support version 1.5 manifests (for libiconv)
Manifest format version 1.5 introduces libiconv as a new required
component. The following changes are required:
. accept version 1.5
. it manifest version >= 1.5, require libiconv for all
host platforms.
Change-Id: I469481e647de8dc13e969d1def0fc66ceb59a56d
Diffstat (limited to 'validate-manifest.pl')
-rwxr-xr-x | validate-manifest.pl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/validate-manifest.pl b/validate-manifest.pl index 1d7e3ea..9858f6f 100755 --- a/validate-manifest.pl +++ b/validate-manifest.pl @@ -243,7 +243,7 @@ sub fields_for_component $fields{url} = 1; $fields{filespec} = 1; $fields{makeflags} = 0; - if ($component !~ /^(linux|dejagnu|expat|python)$/) + if ($component !~ /^(linux|dejagnu|expat|python|libiconv)$/) { $fields{configure} = 1; } @@ -432,6 +432,11 @@ sub check_components_list @win32_components=(); } + if (version_ge($m, "1.5")) + { + push @required_components, "libiconv"; + } + if (($m->{flag_info}{target}) =~ /linux/) { push @required_components, @linux_target_components @@ -470,10 +475,10 @@ sub check_components_list sub check_manifest_version { my ($m) = @_; - if ($m->{mani_ver} !~ /^1\.[1234]$/) + if ($m->{mani_ver} !~ /^1\.[12345]$/) { - error($m, "Unknown manifest version $m->{mani_ver}, treating as 1.4"); - $m->{mani_ver} = "1.4"; + error($m, "Unknown manifest version $m->{mani_ver}, treating as 1.5"); + $m->{mani_ver} = "1.5"; } } |