Message ID | 20180820111623.23173-4-chrismcc@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | scancpan patches | expand |
2018-08-20 13:16 GMT+02:00 Christopher McCrory <chrismcc@gmail.com>: > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > Reviewed-by: Francois Perrad <francois.perrad@gadz.org> --- > utils/scancpan | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/utils/scancpan b/utils/scancpan > index c83730fa13..5db4decc5e 100755 > --- a/utils/scancpan > +++ b/utils/scancpan > @@ -702,9 +702,16 @@ while (my ($distname, $dist) = each %dist) { > ? join q{ or }, @{$dist->{license}} > : $dist->{license}; > # BR requires license name as in http://spdx.org/licenses/ > + $license =~ s|apache_1_1|Apache-1.1|; > $license =~ s|apache_2_0|Apache-2.0|; > + $license =~ s|artistic|Artistic-1.0|; > $license =~ s|artistic_2|Artistic-2.0|; > + $license =~ s|lgpl_2_1|LGPL-2.1|; > + $license =~ s|lgpl_3_0|LGPL-3.0|; > + $license =~ s|gpl_2|GPL-2.0|; > + $license =~ s|gpl_3|GPL-3.0|; > $license =~ s|mit|MIT|; > + $license =~ s|mozilla_1_1|Mozilla-1.1|; > $license =~ s|openssl|OpenSSL|; > $license =~ s|perl_5|Artistic or GPL-1.0+|; > my $license_files = join q{ }, keys %{$license_files{$distname}}; > -- > 2.14.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2018-08-20 13:16 GMT+02:00 Christopher McCrory <span dir="ltr"><<a href="mailto:chrismcc@gmail.com" target="_blank">chrismcc@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Christopher McCrory <<a href="mailto:chrismcc@gmail.com">chrismcc@gmail.com</a>><br></blockquote><div><br></div><div>Reviewed-by: Francois Perrad <<a href="mailto:francois.perrad@gadz.org">francois.perrad@gadz.org</a>><br></div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> ---<br> utils/scancpan | 7 +++++++<br> 1 file changed, 7 insertions(+)<br> <br> diff --git a/utils/scancpan b/utils/scancpan<br> index c83730fa13..5db4decc5e 100755<br> --- a/utils/scancpan<br> +++ b/utils/scancpan<br> @@ -702,9 +702,16 @@ while (my ($distname, $dist) = each %dist) {<br> ? join q{ or }, @{$dist->{license}}<br> : $dist->{license};<br> # BR requires license name as in <a href="http://spdx.org/licenses/" rel="noreferrer" target="_blank">http://spdx.org/licenses/</a><br> + $license =~ s|apache_1_1|Apache-1.1|;<br> $license =~ s|apache_2_0|Apache-2.0|;<br> + $license =~ s|artistic|Artistic-1.0|;<br> $license =~ s|artistic_2|Artistic-2.0|;<br> + $license =~ s|lgpl_2_1|LGPL-2.1|;<br> + $license =~ s|lgpl_3_0|LGPL-3.0|;<br> + $license =~ s|gpl_2|GPL-2.0|;<br> + $license =~ s|gpl_3|GPL-3.0|;<br> $license =~ s|mit|MIT|;<br> + $license =~ s|mozilla_1_1|Mozilla-1.1|;<br> $license =~ s|openssl|OpenSSL|;<br> $license =~ s|perl_5|Artistic or GPL-1.0+|;<br> my $license_files = join q{ }, keys %{$license_files{$distname}};<br> <span class="gmail-HOEnZb"><font color="#888888">-- <br> 2.14.4<br> <br> ______________________________<wbr>_________________<br> buildroot mailing list<br> <a href="mailto:buildroot@busybox.net">buildroot@busybox.net</a><br> <a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/<wbr>mailman/listinfo/buildroot</a><br> </font></span></blockquote></div><br></div></div>
Hello, On Mon, 20 Aug 2018 04:16:23 -0700, Christopher McCrory wrote: > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > --- > utils/scancpan | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas
diff --git a/utils/scancpan b/utils/scancpan index c83730fa13..5db4decc5e 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -702,9 +702,16 @@ while (my ($distname, $dist) = each %dist) { ? join q{ or }, @{$dist->{license}} : $dist->{license}; # BR requires license name as in http://spdx.org/licenses/ + $license =~ s|apache_1_1|Apache-1.1|; $license =~ s|apache_2_0|Apache-2.0|; + $license =~ s|artistic|Artistic-1.0|; $license =~ s|artistic_2|Artistic-2.0|; + $license =~ s|lgpl_2_1|LGPL-2.1|; + $license =~ s|lgpl_3_0|LGPL-3.0|; + $license =~ s|gpl_2|GPL-2.0|; + $license =~ s|gpl_3|GPL-3.0|; $license =~ s|mit|MIT|; + $license =~ s|mozilla_1_1|Mozilla-1.1|; $license =~ s|openssl|OpenSSL|; $license =~ s|perl_5|Artistic or GPL-1.0+|; my $license_files = join q{ }, keys %{$license_files{$distname}};
Signed-off-by: Christopher McCrory <chrismcc@gmail.com> --- utils/scancpan | 7 +++++++ 1 file changed, 7 insertions(+)