* [Buildroot] [PATCH 0/3] scancpan patches
@ 2018-08-20 11:16 Christopher McCrory
2018-08-20 11:16 ` [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long Christopher McCrory
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Christopher McCrory @ 2018-08-20 11:16 UTC (permalink / raw)
To: buildroot
0001-scancpan-wrap-abstract-if-too-long.patch
updated to use 62 columns as requested
0002-scancpan-skip-Dist-Zilla.patch
better check as sugested by Fran?ois
0003-scancpan-support-more-licenses.patch
respun without ambiguous choices
Christopher McCrory (3):
scancpan: wrap abstract if too long
scancpan: skip Dist::Zilla
scancpan: support more licenses
utils/scancpan | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
--
2.14.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long 2018-08-20 11:16 [Buildroot] [PATCH 0/3] scancpan patches Christopher McCrory @ 2018-08-20 11:16 ` Christopher McCrory 2018-08-21 5:52 ` François Perrad 2018-09-20 22:04 ` Thomas Petazzoni 2018-08-20 11:16 ` [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla Christopher McCrory 2018-08-20 11:16 ` [Buildroot] [PATCH 3/3] scancpan: support more licenses Christopher McCrory 2 siblings, 2 replies; 10+ messages in thread From: Christopher McCrory @ 2018-08-20 11:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christopher McCrory <chrismcc@gmail.com> --- utils/scancpan | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/scancpan b/utils/scancpan index 8f47521692..6c90588ed4 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -484,6 +484,8 @@ use HTTP::Tiny; use Safe; use MetaCPAN::API::Tiny; use Digest::SHA qw(sha256_hex); +use Text::Wrap; +$Text::Wrap::columns = 62; # Below, 5.026 should be aligned with the version of perl actually # bundled in Buildroot: @@ -663,7 +665,7 @@ while (my ($distname, $dist) = each %dist) { my $brname = brname( $fsname ); mkdir $dirname unless -d $dirname; if ($need_target{$distname} && ($force || !-f $cfgname)) { - my $abstract = $dist->{abstract}; + my $abstract = wrap("","\t ",$dist->{abstract}); my $homepage = $dist->{resources}->{homepage} || qq{https://metacpan.org/release/${distname}}; say qq{write ${cfgname}} unless $quiet; open my $fh, q{>}, $cfgname; -- 2.14.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long 2018-08-20 11:16 ` [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long Christopher McCrory @ 2018-08-21 5:52 ` François Perrad 2018-09-20 22:04 ` Thomas Petazzoni 1 sibling, 0 replies; 10+ messages in thread From: François Perrad @ 2018-08-21 5:52 UTC (permalink / raw) To: buildroot 2018-08-20 13:16 GMT+02:00 Christopher McCrory <chrismcc@gmail.com>: > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > --- > utils/scancpan | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/utils/scancpan b/utils/scancpan > index 8f47521692..6c90588ed4 100755 > --- a/utils/scancpan > +++ b/utils/scancpan > @@ -484,6 +484,8 @@ use HTTP::Tiny; > use Safe; > use MetaCPAN::API::Tiny; > use Digest::SHA qw(sha256_hex); > +use Text::Wrap; > +$Text::Wrap::columns = 62; > > # Below, 5.026 should be aligned with the version of perl actually > # bundled in Buildroot: > @@ -663,7 +665,7 @@ while (my ($distname, $dist) = each %dist) { > my $brname = brname( $fsname ); > mkdir $dirname unless -d $dirname; > if ($need_target{$distname} && ($force || !-f $cfgname)) { > - my $abstract = $dist->{abstract}; > + my $abstract = wrap("","\t ",$dist->{abstract}); > please, be consistent with the coding style, like this : my $abstract = wrap( q{}, qq{\t }, $dist->{abstract} ); Fran?ois my $homepage = $dist->{resources}->{homepage} || qq{ > https://metacpan.org/release/${distname}}; > say qq{write ${cfgname}} unless $quiet; > open my $fh, q{>}, $cfgname; > -- > 2.14.4 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180821/853eb747/attachment.html> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long 2018-08-20 11:16 ` [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long Christopher McCrory 2018-08-21 5:52 ` François Perrad @ 2018-09-20 22:04 ` Thomas Petazzoni 1 sibling, 0 replies; 10+ messages in thread From: Thomas Petazzoni @ 2018-09-20 22:04 UTC (permalink / raw) To: buildroot Hello, On Mon, 20 Aug 2018 04:16:21 -0700, Christopher McCrory wrote: > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > --- > utils/scancpan | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Could you send an updated version that takes into account the comment made by Fran?ois a month ago ? Thanks, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla 2018-08-20 11:16 [Buildroot] [PATCH 0/3] scancpan patches Christopher McCrory 2018-08-20 11:16 ` [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long Christopher McCrory @ 2018-08-20 11:16 ` Christopher McCrory 2018-08-21 5:46 ` François Perrad 2018-09-20 22:03 ` Thomas Petazzoni 2018-08-20 11:16 ` [Buildroot] [PATCH 3/3] scancpan: support more licenses Christopher McCrory 2 siblings, 2 replies; 10+ messages in thread From: Christopher McCrory @ 2018-08-20 11:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christopher McCrory <chrismcc@gmail.com> --- utils/scancpan | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/scancpan b/utils/scancpan index 6c90588ed4..c83730fa13 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -603,6 +603,7 @@ sub fetch { # we could use the host Module::CoreList data, because host perl and # target perl have the same major version next if ${$dep}{phase} eq q{develop}; + next if ${$dep}{phase} eq q{x_Dist_Zilla}; next if !($test && $top) && ${$dep}{phase} eq q{test}; my $distname = $mcpan->module( $modname )->{distribution}; if (${$dep}{phase} eq q{runtime}) { -- 2.14.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla 2018-08-20 11:16 ` [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla Christopher McCrory @ 2018-08-21 5:46 ` François Perrad 2018-09-20 22:03 ` Thomas Petazzoni 1 sibling, 0 replies; 10+ messages in thread From: François Perrad @ 2018-08-21 5:46 UTC (permalink / raw) To: buildroot 2018-08-20 13:16 GMT+02:00 Christopher McCrory <chrismcc@gmail.com>: > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > --- > utils/scancpan | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/utils/scancpan b/utils/scancpan > index 6c90588ed4..c83730fa13 100755 > --- a/utils/scancpan > +++ b/utils/scancpan > @@ -603,6 +603,7 @@ sub fetch { > # we could use the host Module::CoreList data, because host > perl and > # target perl have the same major version > next if ${$dep}{phase} eq q{develop}; > + next if ${$dep}{phase} eq q{x_Dist_Zilla}; > please, indent with only space (no hard tab). Fran?ois > next if !($test && $top) && ${$dep}{phase} eq q{test}; > my $distname = $mcpan->module( $modname )->{distribution}; > if (${$dep}{phase} eq q{runtime}) { > -- > 2.14.4 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180821/b8016b9a/attachment.html> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla 2018-08-20 11:16 ` [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla Christopher McCrory 2018-08-21 5:46 ` François Perrad @ 2018-09-20 22:03 ` Thomas Petazzoni 1 sibling, 0 replies; 10+ messages in thread From: Thomas Petazzoni @ 2018-09-20 22:03 UTC (permalink / raw) To: buildroot Hello, On Mon, 20 Aug 2018 04:16:22 -0700, Christopher McCrory wrote: > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > --- > utils/scancpan | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/utils/scancpan b/utils/scancpan > index 6c90588ed4..c83730fa13 100755 > --- a/utils/scancpan > +++ b/utils/scancpan > @@ -603,6 +603,7 @@ sub fetch { > # we could use the host Module::CoreList data, because host perl and > # target perl have the same major version > next if ${$dep}{phase} eq q{develop}; > + next if ${$dep}{phase} eq q{x_Dist_Zilla}; I fixed the indentation issue that Fran?ois reported, and applied. BTW, it is not really great that a comment made on August 21 is not addressed by a new version of the patches while we are a month later. I was in fact waiting for a new version to apply this change, but since it didn't arrive, I ended up fixing it up before applying. Thanks, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/3] scancpan: support more licenses 2018-08-20 11:16 [Buildroot] [PATCH 0/3] scancpan patches Christopher McCrory 2018-08-20 11:16 ` [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long Christopher McCrory 2018-08-20 11:16 ` [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla Christopher McCrory @ 2018-08-20 11:16 ` Christopher McCrory 2018-08-21 5:55 ` François Perrad 2018-09-20 22:01 ` Thomas Petazzoni 2 siblings, 2 replies; 10+ messages in thread From: Christopher McCrory @ 2018-08-20 11:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christopher McCrory <chrismcc@gmail.com> --- 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 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/3] scancpan: support more licenses 2018-08-20 11:16 ` [Buildroot] [PATCH 3/3] scancpan: support more licenses Christopher McCrory @ 2018-08-21 5:55 ` François Perrad 2018-09-20 22:01 ` Thomas Petazzoni 1 sibling, 0 replies; 10+ messages in thread From: François Perrad @ 2018-08-21 5:55 UTC (permalink / raw) To: buildroot 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 at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180821/b661fc66/attachment.html> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/3] scancpan: support more licenses 2018-08-20 11:16 ` [Buildroot] [PATCH 3/3] scancpan: support more licenses Christopher McCrory 2018-08-21 5:55 ` François Perrad @ 2018-09-20 22:01 ` Thomas Petazzoni 1 sibling, 0 replies; 10+ messages in thread From: Thomas Petazzoni @ 2018-09-20 22:01 UTC (permalink / raw) To: buildroot 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 -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-09-20 22:04 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-08-20 11:16 [Buildroot] [PATCH 0/3] scancpan patches Christopher McCrory 2018-08-20 11:16 ` [Buildroot] [PATCH 1/3] scancpan: wrap abstract if too long Christopher McCrory 2018-08-21 5:52 ` François Perrad 2018-09-20 22:04 ` Thomas Petazzoni 2018-08-20 11:16 ` [Buildroot] [PATCH 2/3] scancpan: skip Dist::Zilla Christopher McCrory 2018-08-21 5:46 ` François Perrad 2018-09-20 22:03 ` Thomas Petazzoni 2018-08-20 11:16 ` [Buildroot] [PATCH 3/3] scancpan: support more licenses Christopher McCrory 2018-08-21 5:55 ` François Perrad 2018-09-20 22:01 ` Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.