diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2019-03-13 15:08:33 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2019-03-14 15:06:47 +0000 |
commit | cdd000ce0d14bde43a38878d526a218c06b7f35f (patch) | |
tree | 06f1643f0c0b5a8d6e9c3e4f20c70f9f70b92ebc | |
parent | 3d397fbc1bdbd601406322d739592c15d182a726 (diff) |
validate-manifest.pl: Handle manifests version 1.6
They include qemu (but only for linux-hosted toolchains)
Change-Id: I2d7f82bee2f6c4d3aef9278e7f6c3216a87637d2
-rwxr-xr-x | validate-manifest.pl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/validate-manifest.pl b/validate-manifest.pl index 9858f6f..963cc50 100755 --- a/validate-manifest.pl +++ b/validate-manifest.pl @@ -267,6 +267,7 @@ sub fields_for_component } $fields{mingw_only} = 1 if version_ge($m, "1.4"); $fields{mingw_extraconf} = 0 if version_ge($m, "1.4"); + $fields{linuxhost_only} = 1 if version_ge($m, "1.6"); return %fields; } @@ -437,6 +438,11 @@ sub check_components_list push @required_components, "libiconv"; } + if (version_ge($m, "1.6")) + { + push @required_components, "qemu"; + } + if (($m->{flag_info}{target}) =~ /linux/) { push @required_components, @linux_target_components @@ -475,10 +481,10 @@ sub check_components_list sub check_manifest_version { my ($m) = @_; - if ($m->{mani_ver} !~ /^1\.[12345]$/) + if ($m->{mani_ver} !~ /^1\.[123456]$/) { - error($m, "Unknown manifest version $m->{mani_ver}, treating as 1.5"); - $m->{mani_ver} = "1.5"; + error($m, "Unknown manifest version $m->{mani_ver}, treating as 1.6"); + $m->{mani_ver} = "1.6"; } } |