Skip to contentSkip to conversation

support/script/cpan: improve Makefile generation

PATCH New Francois Perrad 3 participants 10 messages Jun 23, 2014 – Jun 29, 2014

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH 1/3 support/script/cpan: improve Makefile generation

- remove trailing space after perl when it's the only dependency
- license: substitution of perl name by BR name
- add a tabulation before source

Signed-off-by Francois Perrad <[email protected]>
---
 support/scripts/scancpan | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
support/scripts/scancpan +7 -4
index 4be4754..348b7cc 100755
@@ -598,14 +598,17 @@ while (my ($distname, $dist) = each %dist) {
         # the scheme is not used, because the job is done by the BR download infrastructure
         # the auth part is not used, because we use $(BR2_CPAN_MIRROR)
         my($filename, $directories, $suffix) = fileparse( $path, q{tar.gz}, q{tgz} );
-        my $dependencies = join q{ }, map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ),
+        my $dependencies = join q{ }, qw( perl ),
+                                      map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ),
                                       map( { fsname( $_ ); } sort @{$deps_runtime{$distname}} );
         my $host_dependencies = join q{ }, map { q{host-} . fsname( $_ ); } sort( @{$deps_build{$distname}},
                                                                                   @{$deps_runtime{$distname}} );
         my $license = ref $dist->{license} eq 'ARRAY'
                     ? join q{ or }, @{$dist->{license}}
                     : $dist->{license};
-        $license = q{Artistic or GPLv1+} if $license eq q{perl_5};
+        $license =~ s|artistic_2|Artistic-2.0|;
+        $license =~ s|openssl|OpenSSL|;
+        $license =~ s|perl_5|Artistic or GPLv1+|;
         say qq{write ${mkname}} unless $quiet;
         open my $fh, q{>}, $mkname;
         say {$fh} qq{################################################################################};

@@ -617,7 +620,7 @@ while (my ($distname, $dist) = each %dist) {
         say {$fh} qq{${brname}_VERSION = ${version}};
         say {$fh} qq{${brname}_SOURCE = ${distname}-\$(${brname}_VERSION).${suffix}};
         say {$fh} qq{${brname}_SITE = \$(BR2_CPAN_MIRROR)${directories}};
-        say {$fh} qq{${brname}_DEPENDENCIES = perl ${dependencies}} if $need_target{$distname};
+        say {$fh} qq{${brname}_DEPENDENCIES = ${dependencies}} if $need_target{$distname};
         say {$fh} qq{HOST_${brname}_DEPENDENCIES = ${host_dependencies}} if $need_host{$distname};
         say {$fh} qq{${brname}_LICENSE = ${license}} if $license && $license ne q{unknown};
         say {$fh} qq{};

@@ -640,7 +643,7 @@ if (-f $cfgname) {
 
 foreach my $distname (keys %need_target) {
     my $fsname = fsname( $distname );
-    $pkg{qq{source "package/${fsname}/Config.in"}} = 1;
+    $pkg{qq{\tsource "package/${fsname}/Config.in"}} = 1;
 }
 
 say qq{${cfgname} must contain the following lines:};
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/3 perl-net-ssleay: new package

Signed-off-by Francois Perrad <[email protected]>
---
 package/Config.in                          |  1 +
 package/perl-net-ssleay/Config.in          |  7 +++++++
 package/perl-net-ssleay/perl-net-ssleay.mk | 14 ++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/perl-net-ssleay/Config.in
 create mode 100644 package/perl-net-ssleay/perl-net-ssleay.mk
package/Config.in +1 -0
index 498630f..fb04014 100644
@@ -424,6 +424,7 @@ endif
 if BR2_PACKAGE_PERL
 menu "Perl libraries/modules"
 	source "package/perl-mojolicious/Config.in"
+	source "package/perl-net-ssleay/Config.in"
 endmenu
 endif
 	source "package/php/Config.in"
package/perl-net-ssleay/Config.in new file +7 -0
new file mode 100644
index 0000000..bc219b0
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PERL_NET_SSLEAY
+	bool "perl-net-ssleay"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Perl extension for using OpenSSL
+
+	  https://metacpan.org/release/Net-SSLeay
package/perl-net-ssleay/perl-net-ssleay.mk new file +14 -0
new file mode 100644
index 0000000..413fdf0
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-net-ssleay
+#
+################################################################################
+
+PERL_NET_SSLEAY_VERSION = 1.64
+PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz
+PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM/
+PERL_NET_SSLEAY_DEPENDENCIES = perl openssl
+PERL_NET_SSLEAY_LICENSE = OpenSSL
+PERL_NET_SSLEAY_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/3 perl-net-ssleay: new package

Quoted 1 line · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 54 lines
---
 package/Config.in                          |  1 +
 package/perl-net-ssleay/Config.in          |  7 +++++++
 package/perl-net-ssleay/perl-net-ssleay.mk | 14 ++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/perl-net-ssleay/Config.in
 create mode 100644 package/perl-net-ssleay/perl-net-ssleay.mk
package/Config.in +1 -0
index 498630f..fb04014 100644
@@ -424,6 +424,7 @@ endif
 if BR2_PACKAGE_PERL
 menu "Perl libraries/modules"
 	source "package/perl-mojolicious/Config.in"
+	source "package/perl-net-ssleay/Config.in"
 endmenu
 endif
 	source "package/php/Config.in"
package/perl-net-ssleay/Config.in new file +7 -0
new file mode 100644
index 0000000..bc219b0
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PERL_NET_SSLEAY
+	bool "perl-net-ssleay"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Perl extension for using OpenSSL
+
+	  https://metacpan.org/release/Net-SSLeay
package/perl-net-ssleay/perl-net-ssleay.mk new file +14 -0
new file mode 100644
index 0000000..413fdf0
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-net-ssleay
+#
+################################################################################
+
+PERL_NET_SSLEAY_VERSION = 1.64
+PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz
+PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM/
+PERL_NET_SSLEAY_DEPENDENCIES = perl openssl
+PERL_NET_SSLEAY_LICENSE = OpenSSL
+PERL_NET_SSLEAY_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Applied
#3 lore raw

PATCH 2/3 perl-net-ssleay: new package

In reply to Francois Perrad

Dear Francois Perrad,

Quoted 8 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
---
 package/Config.in                          |  1 +
 package/perl-net-ssleay/Config.in          |  7 +++++++
 package/perl-net-ssleay/perl-net-ssleay.mk | 14 ++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/perl-net-ssleay/Config.in
 create mode 100644 package/perl-net-ssleay/perl-net-ssleay.mk

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#4 lore raw

PATCH 3/3 perl-xml-libxml: new package

In reply to Francois Perrad

and its CPAN dependencies

Signed-off-by Francois Perrad <[email protected]>
---
 package/Config.in                                          |  4 ++++
 package/perl-xml-libxml/Config.in                          | 10 ++++++++++
 package/perl-xml-libxml/perl-xml-libxml.mk                 | 14 ++++++++++++++
 package/perl-xml-namespacesupport/Config.in                |  6 ++++++
 .../perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 13 +++++++++++++
 package/perl-xml-sax-base/Config.in                        |  6 ++++++
 package/perl-xml-sax-base/perl-xml-sax-base.mk             | 13 +++++++++++++
 package/perl-xml-sax/Config.in                             |  8 ++++++++
 package/perl-xml-sax/perl-xml-sax.mk                       | 14 ++++++++++++++
 9 files changed, 88 insertions(+)
 create mode 100644 package/perl-xml-libxml/Config.in
 create mode 100644 package/perl-xml-libxml/perl-xml-libxml.mk
 create mode 100644 package/perl-xml-namespacesupport/Config.in
 create mode 100644 package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
 create mode 100644 package/perl-xml-sax-base/Config.in
 create mode 100644 package/perl-xml-sax-base/perl-xml-sax-base.mk
 create mode 100644 package/perl-xml-sax/Config.in
 create mode 100644 package/perl-xml-sax/perl-xml-sax.mk
package/Config.in +4 -0
index fb04014..5a380eb 100644
@@ -425,6 +425,10 @@ if BR2_PACKAGE_PERL
 menu "Perl libraries/modules"
 	source "package/perl-mojolicious/Config.in"
 	source "package/perl-net-ssleay/Config.in"
+	source "package/perl-xml-libxml/Config.in"
+	source "package/perl-xml-namespacesupport/Config.in"
+	source "package/perl-xml-sax-base/Config.in"
+	source "package/perl-xml-sax/Config.in"
 endmenu
 endif
 	source "package/php/Config.in"
package/perl-xml-libxml/Config.in new file +10 -0
new file mode 100644
index 0000000..9e3a44e
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_XML_LIBXML
+	bool "perl-xml-libxml"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT
+	select BR2_PACKAGE_PERL_XML_SAX
+	help
+	  Interface to Gnome libxml2 xml parsing and DOM library
+
+	  https://bitbucket.org/shlomif/perl-xml-libxml
package/perl-xml-libxml/perl-xml-libxml.mk new file +14 -0
new file mode 100644
index 0000000..60a8633
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-xml-libxml
+#
+################################################################################
+
+PERL_XML_LIBXML_VERSION = 2.0116
+PERL_XML_LIBXML_SOURCE = XML-LibXML-$(PERL_XML_LIBXML_VERSION).tar.gz
+PERL_XML_LIBXML_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHLOMIF/
+PERL_XML_LIBXML_DEPENDENCIES = perl zlib libxml2 perl-xml-sax perl-xml-namespacesupport
+PERL_XML_LIBXML_LICENSE = Artistic or GPLv1+
+PERL_XML_LIBXML_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
package/perl-xml-namespacesupport/Config.in new file +6 -0
new file mode 100644
index 0000000..bc67d47
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT
+	bool "perl-xml-namespacesupport"
+	help
+	  a simple generic namespace support class
+
+	  https://metacpan.org/release/XML-NamespaceSupport
package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk new file +13 -0
new file mode 100644
index 0000000..8b87a2f
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-xml-namespacesupport
+#
+################################################################################
+
+PERL_XML_NAMESPACESUPPORT_VERSION = 1.11
+PERL_XML_NAMESPACESUPPORT_SOURCE = XML-NamespaceSupport-$(PERL_XML_NAMESPACESUPPORT_VERSION).tar.gz
+PERL_XML_NAMESPACESUPPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERIGRIN/
+PERL_XML_NAMESPACESUPPORT_DEPENDENCIES = perl
+PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPLv1+
+
+$(eval $(perl-package))
package/perl-xml-sax-base/Config.in new file +6 -0
new file mode 100644
index 0000000..2ad25ac
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_XML_SAX_BASE
+	bool "perl-xml-sax-base"
+	help
+	  Base class for SAX Drivers and Filters
+
+	  https://metacpan.org/release/XML-SAX-Base
package/perl-xml-sax-base/perl-xml-sax-base.mk new file +13 -0
new file mode 100644
index 0000000..0e8c67b
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-xml-sax-base
+#
+################################################################################
+
+PERL_XML_SAX_BASE_VERSION = 1.08
+PERL_XML_SAX_BASE_SOURCE = XML-SAX-Base-$(PERL_XML_SAX_BASE_VERSION).tar.gz
+PERL_XML_SAX_BASE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM/
+PERL_XML_SAX_BASE_DEPENDENCIES = perl
+PERL_XML_SAX_BASE_LICENSE = Artistic or GPLv1+
+
+$(eval $(perl-package))
package/perl-xml-sax/Config.in new file +8 -0
new file mode 100644
index 0000000..4f5567e
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PERL_XML_SAX
+	bool "perl-xml-sax"
+	select BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT
+	select BR2_PACKAGE_PERL_XML_SAX_BASE
+	help
+	  Simple API for XML
+
+	  https://metacpan.org/release/XML-SAX
package/perl-xml-sax/perl-xml-sax.mk new file +14 -0
new file mode 100644
index 0000000..83730c2
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-xml-sax
+#
+################################################################################
+
+PERL_XML_SAX_VERSION = 0.99
+PERL_XML_SAX_SOURCE = XML-SAX-$(PERL_XML_SAX_VERSION).tar.gz
+PERL_XML_SAX_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM/
+PERL_XML_SAX_DEPENDENCIES = perl perl-xml-namespacesupport perl-xml-sax-base
+PERL_XML_SAX_LICENSE = Artistic or GPLv1+
+PERL_XML_SAX_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
Signature · 1 line
1.9.1
#5 lore raw

PATCH 3/3 perl-xml-libxml: new package

Quoted 1 line · Francois Perrad

and its CPAN dependencies

This should be split up into four separate patch, one per package. It's quite
easy to do that with git:

git reset master
git add package/perl-xml-namespacesupport
git add -p package/Config.in

and select 'e' to edit the patch, and remove all + lines except the one for perl-xml-namespacesupport.

Otherwise, it all looks good. Seems the scancpan script is working well! So
when you resubmit as separate patches, you can add my Reviewed-by tag.

Regards,
Arnout

Quoted 21 lines
Signed-off-by Francois Perrad <[email protected]>
---
 package/Config.in                                          |  4 ++++
 package/perl-xml-libxml/Config.in                          | 10 ++++++++++
 package/perl-xml-libxml/perl-xml-libxml.mk                 | 14 ++++++++++++++
 package/perl-xml-namespacesupport/Config.in                |  6 ++++++
 .../perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 13 +++++++++++++
 package/perl-xml-sax-base/Config.in                        |  6 ++++++
 package/perl-xml-sax-base/perl-xml-sax-base.mk             | 13 +++++++++++++
 package/perl-xml-sax/Config.in                             |  8 ++++++++
 package/perl-xml-sax/perl-xml-sax.mk                       | 14 ++++++++++++++
 9 files changed, 88 insertions(+)
 create mode 100644 package/perl-xml-libxml/Config.in
 create mode 100644 package/perl-xml-libxml/perl-xml-libxml.mk
 create mode 100644 package/perl-xml-namespacesupport/Config.in
 create mode 100644 package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
 create mode 100644 package/perl-xml-sax-base/Config.in
 create mode 100644 package/perl-xml-sax-base/perl-xml-sax-base.mk
 create mode 100644 package/perl-xml-sax/Config.in
 create mode 100644 package/perl-xml-sax/perl-xml-sax.mk
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#6 lore raw

PATCH 3/3 perl-xml-libxml: new package

In reply to Francois Perrad

Dear Francois Perrad,

Quoted 14 lines · Francois Perrad

and its CPAN dependencies

Signed-off-by Francois Perrad <[email protected]>
---
 package/Config.in                                          |  4 ++++
 package/perl-xml-libxml/Config.in                          | 10 ++++++++++
 package/perl-xml-libxml/perl-xml-libxml.mk                 | 14 ++++++++++++++
 package/perl-xml-namespacesupport/Config.in                |  6 ++++++
 .../perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 13 +++++++++++++
 package/perl-xml-sax-base/Config.in                        |  6 ++++++
 package/perl-xml-sax-base/perl-xml-sax-base.mk             | 13 +++++++++++++
 package/perl-xml-sax/Config.in                             |  8 ++++++++
 package/perl-xml-sax/perl-xml-sax.mk                       | 14 ++++++++++++++
 9 files changed, 88 insertions(+)
Quoted 8 lines
 create mode 100644 package/perl-xml-libxml/Config.in
 create mode 100644 package/perl-xml-libxml/perl-xml-libxml.mk
 create mode 100644 package/perl-xml-namespacesupport/Config.in
 create mode 100644 package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
 create mode 100644 package/perl-xml-sax-base/Config.in
 create mode 100644 package/perl-xml-sax-base/perl-xml-sax-base.mk
 create mode 100644 package/perl-xml-sax/Config.in
 create mode 100644 package/perl-xml-sax/perl-xml-sax.mk

I've applied these packages after splitting your patch in four patches, one per package, as suggested by Arnout.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH 3/3 perl-xml-libxml: new package

Fran?ois,

Quoted 19 lines · Thomas Petazzoni
Quoted 10 lines
 package/Config.in                                          |  4 ++++
 package/perl-xml-libxml/Config.in                          | 10 ++++++++++
 package/perl-xml-libxml/perl-xml-libxml.mk                 | 14 ++++++++++++++
 package/perl-xml-namespacesupport/Config.in                |  6 ++++++
 .../perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 13 +++++++++++++
 package/perl-xml-sax-base/Config.in                        |  6 ++++++
 package/perl-xml-sax-base/perl-xml-sax-base.mk             | 13 +++++++++++++
 package/perl-xml-sax/Config.in                             |  8 ++++++++
 package/perl-xml-sax/perl-xml-sax.mk                       | 14 ++++++++++++++
 9 files changed, 88 insertions(+)
Quoted 8 lines
 create mode 100644 package/perl-xml-libxml/Config.in
 create mode 100644 package/perl-xml-libxml/perl-xml-libxml.mk
 create mode 100644 package/perl-xml-namespacesupport/Config.in
 create mode 100644 package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
 create mode 100644 package/perl-xml-sax-base/Config.in
 create mode 100644 package/perl-xml-sax-base/perl-xml-sax-base.mk
 create mode 100644 package/perl-xml-sax/Config.in
 create mode 100644 package/perl-xml-sax/perl-xml-sax.mk
Quoted 2 lines

I've applied these packages after splitting your patch in four patches, one per package, as suggested by Arnout.

The perl-xml-libxml package does not build. See
http://autobuild.buildroot.org/results/f80/f809c99ce4db80e64ca46865fcd9b75b0dcc1fcd/build-end.log.

Could you send a followup patch to fix it?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#8 lore raw

PATCH 1/3 support/script/cpan: improve Makefile generation

In reply to Francois Perrad
Quoted 5 lines · Francois Perrad

- remove trailing space after perl when it's the only dependency
- license: substitution of perl name by BR name
- add a tabulation before source

Signed-off-by Francois Perrad <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 47 lines
---
 support/scripts/scancpan | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
support/scripts/scancpan +7 -4
index 4be4754..348b7cc 100755
@@ -598,14 +598,17 @@ while (my ($distname, $dist) = each %dist) {
         # the scheme is not used, because the job is done by the BR download infrastructure
         # the auth part is not used, because we use $(BR2_CPAN_MIRROR)
         my($filename, $directories, $suffix) = fileparse( $path, q{tar.gz}, q{tgz} );
-        my $dependencies = join q{ }, map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ),
+        my $dependencies = join q{ }, qw( perl ),
+                                      map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ),
                                       map( { fsname( $_ ); } sort @{$deps_runtime{$distname}} );
         my $host_dependencies = join q{ }, map { q{host-} . fsname( $_ ); } sort( @{$deps_build{$distname}},
                                                                                   @{$deps_runtime{$distname}} );
         my $license = ref $dist->{license} eq 'ARRAY'
                     ? join q{ or }, @{$dist->{license}}
                     : $dist->{license};
-        $license = q{Artistic or GPLv1+} if $license eq q{perl_5};
+        $license =~ s|artistic_2|Artistic-2.0|;
+        $license =~ s|openssl|OpenSSL|;
+        $license =~ s|perl_5|Artistic or GPLv1+|;
         say qq{write ${mkname}} unless $quiet;
         open my $fh, q{>}, $mkname;
         say {$fh} qq{################################################################################};

@@ -617,7 +620,7 @@ while (my ($distname, $dist) = each %dist) {
         say {$fh} qq{${brname}_VERSION = ${version}};
         say {$fh} qq{${brname}_SOURCE = ${distname}-\$(${brname}_VERSION).${suffix}};
         say {$fh} qq{${brname}_SITE = \$(BR2_CPAN_MIRROR)${directories}};
-        say {$fh} qq{${brname}_DEPENDENCIES = perl ${dependencies}} if $need_target{$distname};
+        say {$fh} qq{${brname}_DEPENDENCIES = ${dependencies}} if $need_target{$distname};
         say {$fh} qq{HOST_${brname}_DEPENDENCIES = ${host_dependencies}} if $need_host{$distname};
         say {$fh} qq{${brname}_LICENSE = ${license}} if $license && $license ne q{unknown};
         say {$fh} qq{};

@@ -640,7 +643,7 @@ if (-f $cfgname) {
 
 foreach my $distname (keys %need_target) {
     my $fsname = fsname( $distname );
-    $pkg{qq{source "package/${fsname}/Config.in"}} = 1;
+    $pkg{qq{\tsource "package/${fsname}/Config.in"}} = 1;
 }
 
 say qq{${cfgname} must contain the following lines:};
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Applied
#9 lore raw

PATCH 1/3 support/script/cpan: improve Makefile generation

In reply to Francois Perrad

Dear Francois Perrad,

Quoted 8 lines · Francois Perrad

- remove trailing space after perl when it's the only dependency
- license: substitution of perl name by BR name
- add a tabulation before source

Signed-off-by Francois Perrad <[email protected]>
---
 support/scripts/scancpan | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com