summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/debian/patchlevel.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/debian/patchlevel.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/debian/patchlevel.diff')
-rw-r--r--meta/recipes-devtools/perl/perl/debian/patchlevel.diff30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/patchlevel.diff b/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
new file mode 100644
index 0000000000..8656b027e8
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
@@ -0,0 +1,30 @@
1From b517c5e15d0871e36d0f1187661fe1dd28ddf820 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Sun, 15 May 2011 19:35:58 +0300
4Subject: List packaged patches in patchlevel.h
5
6Origin: vendor
7Bug-Debian: http://bugs.debian.org/567489
8
9The list of packaged patches is in patchlevel-debian.h, which is generated
10from the debian/patches/ directory when building the package.
11
12Patch-Name: debian/patchlevel.diff
13---
14 patchlevel.h | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/patchlevel.h b/patchlevel.h
18index a0ad78b..01367b7 100644
19--- a/patchlevel.h
20+++ b/patchlevel.h
21@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
22 ,"uncommitted-changes"
23 #endif
24 PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
25+#ifdef DEBIAN
26+#include "patchlevel-debian.h"
27+#endif
28 ,NULL
29 };
30