diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-01-21 12:15:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-21 23:44:22 +0000 |
commit | 5b9a07661195af595129a1e134117f61909ba560 (patch) | |
tree | 5af76838cb1358c262a42f4eec8466bf3eee6f79 /meta | |
parent | aab11d8d283fe2d1619eca20eee83bc5a3e230bd (diff) | |
download | poky-5b9a07661195af595129a1e134117f61909ba560.tar.gz |
perl: fix a race issue during 'make install'
(From OE-Core rev: 0ba3bde80ec7f2e66b6de790d8e198edef2b8980)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/perl-sanity/perl_5.28.1.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch b/meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch new file mode 100644 index 0000000000..26590f5908 --- /dev/null +++ b/meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 965adc80636e24e9608ca983c18c95cae08de021 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 21 Jan 2019 12:09:13 +0100 | ||
4 | Subject: [PATCH] Make sure install.perl runs before install.man | ||
5 | |||
6 | Otherwise, install.man may attempt to write to non-existing directory: | ||
7 | | Can't open file /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/perl/5.28.1-r0/image/usr/libx32/perl5/5.28.1/x86_64-linux/.packlist: No such file or directory at installman line 183. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/issues/72] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index cd8d75f..82bdc1d 100644 | ||
17 | --- a/Makefile | ||
18 | +++ b/Makefile | ||
19 | @@ -410,7 +410,7 @@ install.perl: installperl | miniperl$X | ||
20 | ./miniperl_top installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
21 | -@test ! -s extras.lst || $(MAKE) extras.install | ||
22 | |||
23 | -install.man: installman pod/perltoc.pod | miniperl$X | ||
24 | +install.man: install.perl installman pod/perltoc.pod | miniperl$X | ||
25 | ./miniperl_top installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | ||
26 | |||
27 | ifneq ($(perlname),perl) | ||
diff --git a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb index 71892a2436..949758c4d4 100644 --- a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb +++ b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | |||
22 | file://fix-race-failures.patch \ | 22 | file://fix-race-failures.patch \ |
23 | file://fix-race-failures-2.patch \ | 23 | file://fix-race-failures-2.patch \ |
24 | file://0001-Also-build-dynaloader-separately-as-race-failures-ha.patch \ | 24 | file://0001-Also-build-dynaloader-separately-as-race-failures-ha.patch \ |
25 | file://0001-Make-sure-install.perl-runs-before-install.man.patch \ | ||
25 | " | 26 | " |
26 | 27 | ||
27 | SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5" | 28 | SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5" |