Skip to contentSkip to conversation

libmodule-build-perl: upgrade 0.4229 -> 0.4231

PATCH Superseded Tim Orling 3 participants 5 messages Feb 25, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tim Orling

author
#0 lore raw

PATCH 1/1 libmodule-build-perl: upgrade 0.4229 -> 0.4231

Upstream release notes:
"
0.4231 - Wed Jan 29 08:47:56 CET 2020

- Released 0.42_30 without code changes

0.42_30 - Wed Jul 31 13:15:39 CEST 2019

- Add dependency on ExtUtils::PL2Bat
"

Add ptest RDEPENDS:
- ExtUtils::Command::MM for t/compat.t
- gcc, make didn't seem like enough for ptest, replace with packagegroup-core-buildessential which definitely works
- perl-dev for EXTERN.h in t/xs.t

Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev

Five tests from t/help.t are skipped because they are TODO

t/par.t is skipped because PAR::Dist (0.17+) is not present

t/ppm.t is skipped because "HTML support not installed"

All other tests pass.

---
 ...001-Committing-changes-from-do_patch.patch | 22 +++++++++++++++++++
 ...4229.bb => libmodule-build-perl_0.4231.bb} | 16 +++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch
 rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (87%)
meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch new file +22 -0
new file mode 100644
index 0000000000..398f94ec5f
@@ -0,0 +1,22 @@
+From e1d8264d1d88456ce608a51b9a8f4addb0da6e3b Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
+Date: Thu, 20 Feb 2020 19:55:31 +0000
+Subject: [PATCH] Committing changes from do_patch
+
+---
+ lib/Module/Build/Base.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
+index b900b17..a97a722 100644
+--- a/lib/Module/Build/Base.pm
++++ b/lib/Module/Build/Base.pm
+@@ -3089,7 +3089,7 @@ sub fix_shebang_line { # Adapted from fixin() in ExtUtils::MM_Unix 1.35
+ 
+     my ($cmd, $arg) = (split(' ', $line, 2), '');
+     next unless $cmd =~ /perl/i;
+-    my $interpreter = $self->{properties}{perl};
++    my $interpreter = "/usr/bin/perl";
+ 
+     $self->log_verbose("Changing sharpbang in $file to $interpreter\n");
+     my $shb = '';
meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb renamed from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +11 -5
similarity index 87%
rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb
rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb
index e3ba40d96c..91dbfb8606 100644
@@ -15,9 +15,11 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d
 
 SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \
            file://run-ptest \
-          "
-SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9"
-SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18"
+           file://ptest-perl/run-ptest \
+           file://0001-Committing-changes-from-do_patch.patch \
+           "
+SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001"
+SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717"
 
 S = "${WORKDIR}/Module-Build-${PV}"
 
@@ -75,9 +77,10 @@ RDEPENDS_${PN} += " \
 "
 
 RDEPENDS_${PN}-ptest += " \
-    gcc \
-    make \
+    packagegroup-core-buildessential \
+    perl-dev \
     perl-module-blib \
+    perl-module-extutils-command-mm \
     perl-module-file-temp \
     perl-module-lib \
     perl-module-perlio \
@@ -103,4 +106,7 @@ RPROVIDES_${PN} += "\
     libmodule-build-podparser-perl \
 "
 
+# t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev
+INSANE_SKIP_${PN}-ptest = "dev-deps"
+
 BBCLASSEXTEND = "native"
Signature · 1 line
2.24.0
#1 lore raw

meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d · line 19

Quoted 2 lines · Tim Orling
meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb renamed from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +2 -0
+           file://ptest-perl/run-ptest \
+           file://0001-Committing-changes-from-do_patch.patch \

These two are 'devtool upgrade' noise, and should be removed. The recipe does weird things which triggers devtool to add items unnecessarily.

Alex

#2 lore raw

But probably a better solution would be to keep the patch, and drop the custom sed hack!

Alex

Quoted 12 lines · Alexander Kanavin

meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d · line 19

Quoted 2 lines · Tim Orling
meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb renamed from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +2 -0
+           file://ptest-perl/run-ptest \
+           file://0001-Committing-changes-from-do_patch.patch \

These two are 'devtool upgrade' noise, and should be removed. The recipe does weird things which triggers devtool to add items unnecessarily.

Alex

#4 lore raw

✗ patchtest: failure for libmodule-build-perl: upgrade 0.4229 -> 0.4231

In reply to Tim Orling

== Series Details ==

Series: libmodule-build-perl: upgrade 0.4229 -> 0.4231
Revision: 1
URL : https://patchwork.openembedded.org/series/22948/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Patch            libmodule-build-perl: upgrade 0.4229 -> 0.4231
 Issue             Patch is missing Signed-off-by [test_signed_off_by_presence] 
  Suggested fix    Sign off the patch (either manually or with "git commit --amend -s")

* Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence]
Suggested fix Sign off the added patch file (meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch)

* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]

  Suggested fix    Add Upstream-Status: <Valid status> to the header of meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
author
#3 lore raw
In reply to Alexander Kanavin

Somehow I totally missed this when sending the patch (obviously). Sigh.

I’m on the fence about patch versus sed. I’m inclined to stop mucking about…

Thank you for the catch!

Quoted 14 lines · Alexander Kanavin

But probably a better solution would be to keep the patch, and drop the custom sed hack!

Alex

On Tue, 25 Feb 2020 at 22:58, Alexander Kanavin <[email protected] <mailto:[email protected]>> wrote:
On Tue, 25 Feb 2020 at 22:30, Tim Orling <[email protected] <mailto:[email protected]>> wrote:

meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb renamed from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +2 -0
+           file://ptest-perl/run-ptest \
+           file://0001-Committing-changes-from-do_patch.patch \

These two are 'devtool upgrade' noise, and should be removed. The recipe does weird things which triggers devtool to add items unnecessarily.

Alex