summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-01-23 22:33:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-24 17:45:25 +0000
commit66e2779535797840edbe1a6bfefd4d5fc6a7c815 (patch)
tree6f18aa047b6229438313dfb3ca1aaf994fb1552a /meta
parentcc4e883a5413c67d647534c3d5afef1cd160f40a (diff)
downloadpoky-66e2779535797840edbe1a6bfefd4d5fc6a7c815.tar.gz
perl: Make install.perl depend on install.sym
Fixed a race issue when do_install: Generating wrapper script for /path/to/8.1-r0/image/path/to/8.1-r0/recipe-sysroot-native/usr/bin/perl-native/perl5.28.1 mv: cannot stat /path/to/8.1-r0/image/path/to/8.1-r0/recipe-sysroot-native/usr/bin/perl-native/perl5.28.1: No such file or directory (From OE-Core rev: 70859e12a1ea17a6b924f720f3677adcb7e87e0a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch32
-rw-r--r--meta/recipes-devtools/perl-sanity/perl_5.28.1.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch b/meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch
new file mode 100644
index 0000000000..1267339978
--- /dev/null
+++ b/meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch
@@ -0,0 +1,32 @@
1From a0a2fcac3735ca90017976d2b87f550d051a969b Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 22 Jan 2019 19:21:27 -0800
4Subject: [PATCH] Makefile: Make install.perl depend on install.sym
5
6Fix a race issue when install, there might be no
7$(installbin)/$(perlname)$(version) when install.sym runs after install.perl
8since install.sym removes it.
9
10Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/73]
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile b/Makefile
18index cd8d75f..1aa8ef2 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -406,7 +406,7 @@ META.yml: Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm miniper
22
23 install: install.perl install.sym install.man
24
25-install.perl: installperl | miniperl$X
26+install.perl: installperl install.sym | miniperl$X
27 ./miniperl_top installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
28 -@test ! -s extras.lst || $(MAKE) extras.install
29
30--
312.10.2
32
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 176980e1b2..a2ec264100 100644
--- a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb
+++ b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
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 file://0001-Make-sure-install.perl-runs-before-install.man.patch \
26 file://0001-Makefile-Make-install.perl-depend-on-install.sym.patch \
26 " 27 "
27 28
28SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5" 29SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5"