diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-06-17 00:19:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:38:20 +0100 |
commit | 06d43a90acbe63baea62d220659149a3ff2f9198 (patch) | |
tree | 7bc9adc24b74694192fba12119e87b0d86521fb5 /meta/recipes-devtools/perl/perl/debian/patchlevel.diff | |
parent | eb54c29d0566e01c287bdccbdb26c188aac66033 (diff) | |
download | openembedded-core-contrib-06d43a90acbe63baea62d220659149a3ff2f9198.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
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/patchlevel.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl/debian/patchlevel.diff | 30 |
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 @@ +From b517c5e15d0871e36d0f1187661fe1dd28ddf820 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Sun, 15 May 2011 19:35:58 +0300 +Subject: List packaged patches in patchlevel.h + +Origin: vendor +Bug-Debian: http://bugs.debian.org/567489 + +The list of packaged patches is in patchlevel-debian.h, which is generated +from the debian/patches/ directory when building the package. + +Patch-Name: debian/patchlevel.diff +--- + patchlevel.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/patchlevel.h b/patchlevel.h +index a0ad78b..01367b7 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -137,6 +137,9 @@ static const char * const local_patches[] = { + ,"uncommitted-changes" + #endif + PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ ++#ifdef DEBIAN ++#include "patchlevel-debian.h" ++#endif + ,NULL + }; + |