summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-09-19 22:34:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 15:11:09 +0100
commitffdc23ab5311b651e27c9bda16da5ddd482249fa (patch)
tree260e3892045e4e3355c8aeae2889b710985b85b5
parent1fe48d03f8fe2834c464ab29d64abefc4ecf4e43 (diff)
downloadpoky-ffdc23ab5311b651e27c9bda16da5ddd482249fa.tar.gz
openssl: fix do_configure error when cwd is not in @INC
Fixed when building on Debian-testing: | Can't locate find.pl in @INC (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.22.2 /usr/local/share/perl/5.22.2 /usr/lib/x86_64-linux-gnu/perl5/5.22 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.22 /usr/share/perl/5.22 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at perlpath.pl line 7. (From OE-Core rev: c28065671b582c140d5971c73791d2ac8bdebe69) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch34
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2h.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch b/meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
new file mode 100644
index 0000000000..065b9b122a
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
@@ -0,0 +1,34 @@
1From e427748f3bb5d37e78dc8d70a558c373aa8ababb Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 19 Sep 2016 22:06:28 -0700
4Subject: [PATCH] util/perlpath.pl: make it work when cwd is not in @INC
5
6Fixed when building on Debian-testing:
7| Can't locate find.pl in @INC (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.22.2 /usr/local/share/perl/5.22.2 /usr/lib/x86_64-linux-gnu/perl5/5.22 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.22 /usr/share/perl/5.22 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at perlpath.pl line 7.
8
9The find.pl is added by oe-core, so once openssl/find.pl is removed,
10then this patch can be dropped.
11
12Upstream-Status: Inappropriate [OE-Specific]
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15---
16 util/perlpath.pl | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/util/perlpath.pl b/util/perlpath.pl
20index a1f236b..5599892 100755
21--- a/util/perlpath.pl
22+++ b/util/perlpath.pl
23@@ -4,6 +4,8 @@
24 # line in all scripts that rely on perl.
25 #
26
27+BEGIN { unshift @INC, "."; }
28+
29 require "find.pl";
30
31 $#ARGV == 0 || print STDERR "usage: perlpath newpath (eg /usr/bin)\n";
32--
332.9.0
34
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
index 4f91e551be..c8444d39b9 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
@@ -41,6 +41,7 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
41 file://parallel.patch \ 41 file://parallel.patch \
42 file://CVE-2016-2177.patch \ 42 file://CVE-2016-2177.patch \
43 file://CVE-2016-2178.patch \ 43 file://CVE-2016-2178.patch \
44 file://openssl-util-perlpath.pl-cwd.patch \
44 " 45 "
45SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0" 46SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"
46SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" 47SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"