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/native-nopacklist.patch | |
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/native-nopacklist.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl/native-nopacklist.patch | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/native-nopacklist.patch b/meta/recipes-devtools/perl/perl/native-nopacklist.patch new file mode 100644 index 0000000000..5482dcb79c --- /dev/null +++ b/meta/recipes-devtools/perl/perl/native-nopacklist.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | Upstream-Status:Inappropriate [debian patch] | ||
2 | |||
3 | Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files | ||
4 | |||
5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
6 | --- | ||
7 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 35 ++--------------------- | ||
8 | 1 file changed, 3 insertions(+), 32 deletions(-) | ||
9 | |||
10 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
11 | index f63145c..a589710 100644 | ||
12 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
13 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
14 | @@ -2122,11 +2122,6 @@ pure_perl_install :: all | ||
15 | }; | ||
16 | |||
17 | push @m, | ||
18 | -q{ read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \ | ||
19 | - write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \ | ||
20 | -} unless $self->{NO_PACKLIST}; | ||
21 | - | ||
22 | - push @m, | ||
23 | q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \ | ||
24 | "$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \ | ||
25 | "$(INST_BIN)" "$(DESTINSTALLBIN)" \ | ||
26 | @@ -2158,10 +2153,6 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \ | ||
27 | pure_vendor_install :: all | ||
28 | $(NOECHO) $(MOD_INSTALL) \ | ||
29 | }; | ||
30 | - push @m, | ||
31 | -q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \ | ||
32 | - write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \ | ||
33 | -} unless $self->{NO_PACKLIST}; | ||
34 | |||
35 | push @m, | ||
36 | q{ "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \ | ||
37 | @@ -2187,37 +2178,19 @@ doc_vendor_install :: all | ||
38 | |||
39 | push @m, q{ | ||
40 | doc_perl_install :: all | ||
41 | - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" | ||
42 | - -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" | ||
43 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
44 | - "Module" "$(NAME)" \ | ||
45 | - "installed into" $(INSTALLPRIVLIB) \ | ||
46 | - LINKTYPE "$(LINKTYPE)" \ | ||
47 | - VERSION "$(VERSION)" \ | ||
48 | - EXE_FILES "$(EXE_FILES)" \ | ||
49 | - >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{" | ||
50 | |||
51 | doc_site_install :: all | ||
52 | - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" | ||
53 | - -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" | ||
54 | + $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLSITEARCH)/perllocal.pod" | ||
55 | + -$(NOECHO) $(MKPATH) "$(DESTINSTALLSITEARCH)" | ||
56 | -$(NOECHO) $(DOC_INSTALL) \ | ||
57 | "Module" "$(NAME)" \ | ||
58 | "installed into" $(INSTALLSITELIB) \ | ||
59 | LINKTYPE "$(LINKTYPE)" \ | ||
60 | VERSION "$(VERSION)" \ | ||
61 | EXE_FILES "$(EXE_FILES)" \ | ||
62 | - >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{" | ||
63 | + >> "}.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{" | ||
64 | |||
65 | doc_vendor_install :: all | ||
66 | - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" | ||
67 | - -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" | ||
68 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
69 | - "Module" "$(NAME)" \ | ||
70 | - "installed into" $(INSTALLVENDORLIB) \ | ||
71 | - LINKTYPE "$(LINKTYPE)" \ | ||
72 | - VERSION "$(VERSION)" \ | ||
73 | - EXE_FILES "$(EXE_FILES)" \ | ||
74 | - >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{" | ||
75 | |||
76 | } unless $self->{NO_PERLLOCAL}; | ||
77 | |||
78 | @@ -2226,13 +2199,11 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs | ||
79 | $(NOECHO) $(NOOP) | ||
80 | |||
81 | uninstall_from_perldirs :: | ||
82 | - $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" | ||
83 | |||
84 | uninstall_from_sitedirs :: | ||
85 | $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" | ||
86 | |||
87 | uninstall_from_vendordirs :: | ||
88 | - $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" | ||
89 | }; | ||
90 | |||
91 | join("",@m); | ||