diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff new file mode 100644 index 000000000..601ee4c30 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff @@ -0,0 +1,56 @@ +From def4aa3817f98aae625e601b791ef068276f05d5 Mon Sep 17 00:00:00 2001 +From: Dominic Hargreaves <dom@earth.li> +Date: Mon, 17 May 2010 13:23:07 +0300 +Subject: Point users to Debian packages of deprecated core modules + +Bug-Debian: http://bugs.debian.org/747628 + +Several modules are being deprecated with perl 5.20. +To get a clean transition, perl/perl-modules is going to recommend the +separate Debian packages of these for one release cycle so that they will be +pulled in by default on upgrades. This is taking place for perl 5.20/jessie. + +However, on systems configured to ignore recommendations the deprecation +warnings will still be useful, so modify them slightly to point to the +separate packages instead. + +Patch-Name: debian/deprecate-with-apt.diff +--- + lib/deprecate.pm | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/lib/deprecate.pm b/lib/deprecate.pm +index 47bc112..b0c61df 100644 +--- a/lib/deprecate.pm ++++ b/lib/deprecate.pm +@@ -7,6 +7,13 @@ our $VERSION = 0.03; + our %Config; + unless (%Config) { require Config; *Config = \%Config::Config; } + ++# Debian-specific change: recommend the separate Debian packages of ++# deprecated modules where available ++ ++our %DEBIAN_PACKAGES = ( ++ # None for the perl 5.22 cycle ++); ++ + # This isn't a public API. It's internal to code maintained by the perl-porters + # If you would like it to be a public API, please send a patch with + # documentation and tests. Until then, it may change without warning. +@@ -58,9 +65,15 @@ EOM + if (defined $callers_bitmask + && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1) + || vec($callers_bitmask, $warnings::Offsets{all}, 1))) { +- warn <<"EOM"; ++ if (my $deb = $DEBIAN_PACKAGES{$package}) { ++ warn <<"EOM"; ++$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. ++EOM ++ } else { ++ warn <<"EOM"; + $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. + EOM ++ } + } + } + } |