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:39:58 +0100 |
commit | 3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch) | |
tree | 398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff | |
parent | a01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff) | |
download | poky-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/deprecate-with-apt.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff new file mode 100644 index 0000000000..601ee4c304 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff | |||
@@ -0,0 +1,56 @@ | |||
1 | From def4aa3817f98aae625e601b791ef068276f05d5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dominic Hargreaves <dom@earth.li> | ||
3 | Date: Mon, 17 May 2010 13:23:07 +0300 | ||
4 | Subject: Point users to Debian packages of deprecated core modules | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/747628 | ||
7 | |||
8 | Several modules are being deprecated with perl 5.20. | ||
9 | To get a clean transition, perl/perl-modules is going to recommend the | ||
10 | separate Debian packages of these for one release cycle so that they will be | ||
11 | pulled in by default on upgrades. This is taking place for perl 5.20/jessie. | ||
12 | |||
13 | However, on systems configured to ignore recommendations the deprecation | ||
14 | warnings will still be useful, so modify them slightly to point to the | ||
15 | separate packages instead. | ||
16 | |||
17 | Patch-Name: debian/deprecate-with-apt.diff | ||
18 | --- | ||
19 | lib/deprecate.pm | 15 ++++++++++++++- | ||
20 | 1 file changed, 14 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/lib/deprecate.pm b/lib/deprecate.pm | ||
23 | index 47bc112..b0c61df 100644 | ||
24 | --- a/lib/deprecate.pm | ||
25 | +++ b/lib/deprecate.pm | ||
26 | @@ -7,6 +7,13 @@ our $VERSION = 0.03; | ||
27 | our %Config; | ||
28 | unless (%Config) { require Config; *Config = \%Config::Config; } | ||
29 | |||
30 | +# Debian-specific change: recommend the separate Debian packages of | ||
31 | +# deprecated modules where available | ||
32 | + | ||
33 | +our %DEBIAN_PACKAGES = ( | ||
34 | + # None for the perl 5.22 cycle | ||
35 | +); | ||
36 | + | ||
37 | # This isn't a public API. It's internal to code maintained by the perl-porters | ||
38 | # If you would like it to be a public API, please send a patch with | ||
39 | # documentation and tests. Until then, it may change without warning. | ||
40 | @@ -58,9 +65,15 @@ EOM | ||
41 | if (defined $callers_bitmask | ||
42 | && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1) | ||
43 | || vec($callers_bitmask, $warnings::Offsets{all}, 1))) { | ||
44 | - warn <<"EOM"; | ||
45 | + if (my $deb = $DEBIAN_PACKAGES{$package}) { | ||
46 | + warn <<"EOM"; | ||
47 | +$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line. | ||
48 | +EOM | ||
49 | + } else { | ||
50 | + warn <<"EOM"; | ||
51 | $package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line. | ||
52 | EOM | ||
53 | + } | ||
54 | } | ||
55 | } | ||
56 | } | ||