summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-06-17 00:19:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-01 15:39:58 +0100
commit3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch)
tree398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff
parenta01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff)
downloadpoky-3f7e55baa6b65b39c5698bb58320f85876cebe23.tar.gz
perl: 5.20.0 -> 5.22.0
* Remove: - perl-5.14.3-fix-CVE-2010-4777.patch: backport - fix-FF_MORE-crash.patch: backport - perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like: RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata" If some packages do RPDEND on something like perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather than keep use RPROVIDES in perl-rprovides.inc, so remove it. - perl-rprovides_5.20.0.inc: it only has one line: RPROVIDES_perl-module-module-build, but the perl-module-module-build is gone in 5.22.0, so remove it. * Update: - debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Makefile.SH.patch - Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch - native-nopacklist.patch - config.sh * The CGI.pm and Module::Build disappear from core, so no perl-module-module-build.rpm any more, more info: http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22 (From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff28
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff
deleted file mode 100644
index 7110298f04..0000000000
--- a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff
+++ /dev/null
@@ -1,28 +0,0 @@
1From 4d1b20bcec1610d22b718ffae154427a7a218632 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Fri, 22 Apr 2011 11:15:32 +0300
4Subject: Skip tests specific to the upstream Git repository
5
6These tests fail if run from a different git repository than
7upstream. This complicates things needlessly for downstream packagers.
8
9Skip the tests altogether even if the .git directory exists.
10
11Patch-Name: debian/skip-upstream-git-tests.diff
12---
13 t/test.pl | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/t/test.pl b/t/test.pl
17index 30db88c..0fdc4f4 100644
18--- a/t/test.pl
19+++ b/t/test.pl
20@@ -159,7 +159,7 @@ sub skip_all_without_config {
21
22 sub find_git_or_skip {
23 my ($source_dir, $reason);
24- if (-d '.git') {
25+ if (-d '.git' && ! -d 'debian') {
26 $source_dir = '.';
27 } elsif (-l 'MANIFEST' && -l 'AUTHORS') {
28 my $where = readlink 'MANIFEST';