summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMingde (Matthew) Zeng <matthew.zeng@windriver.com>2020-02-24 13:10:08 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:28 +0000
commitc9426ff8e4db0a49a79276dc57821e377d8d8546 (patch)
tree00e9d8bbffca6014d1e3df80346781f5b8c625d9 /meta/recipes-devtools
parent9cd9c0d5bb424c2d958e263d3dda5003f9c06d94 (diff)
downloadpoky-c9426ff8e4db0a49a79276dc57821e377d8d8546.tar.gz
perl: fix lib/warnings test on core-image-sato
Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. (From OE-Core rev: 5198aa954ad0bffb7d6609e5118f642a59595b18) Signed-off-by: Matthew Zeng <matthew.zeng@windriver.com> -- Mingde (Matthew) Zeng Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch30
-rw-r--r--meta/recipes-devtools/perl/perl_5.30.1.bb2
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch
new file mode 100644
index 0000000000..79cae0d6fa
--- /dev/null
+++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch
@@ -0,0 +1,30 @@
1From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001
2From: Richard Leach <rich+perl@hyphen-dash-hyphen.info>
3Date: Sun, 19 May 2019 20:16:41 +0000
4Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl
5
6This prevents unexpected text and fixes test lib/warnings.t
7
8Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5]
9
10Signed-off-by: Matthew Zeng <matthew.zeng@windriver.com>
11
12---
13 t/loc_tools.pl | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/t/loc_tools.pl b/t/loc_tools.pl
17index c76e29388a..beebd98d88 100644
18--- a/t/loc_tools.pl
19+++ b/t/loc_tools.pl
20@@ -421,7 +421,7 @@ sub find_locales ($;$) {
21 }
22
23 # The rest of the locales are in this file.
24- push @Data, <DATA>;
25+ push @Data, <DATA>; close DATA;
26
27 foreach my $line (@Data) {
28 my ($locale_name, $language_codes, $country_codes, $encodings) =
29--
302.25.0
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
index 4869012b1a..9d747aa5b4 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
@@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
21 file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ 21 file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \
22 file://0002-Constant-Fix-up-shebang.patch \ 22 file://0002-Constant-Fix-up-shebang.patch \
23 file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ 23 file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \
24 file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \
24 file://determinism.patch \ 25 file://determinism.patch \
25 file://racefix.patch \ 26 file://racefix.patch \
26 " 27 "
@@ -388,4 +389,3 @@ EOF
388 chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl 389 chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl
389 cat ${SYSROOT_DESTDIR}${bindir}/nativeperl 390 cat ${SYSROOT_DESTDIR}${bindir}/nativeperl
390} 391}
391