diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-09-19 22:34:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-18 13:14:22 +0100 |
commit | d3c0a560a8d82e7a3ec03410a1a5e83eaa6fdbf2 (patch) | |
tree | c916b32120792e3d9fcfe0cf68d223d9ed17b88e /meta | |
parent | 62685cbff555adfffa1e059ce2fba61ca4caee45 (diff) | |
download | poky-d3c0a560a8d82e7a3ec03410a1a5e83eaa6fdbf2.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)
(From OE-Core rev: d0500320747608783b41f0035bf962b877a6a1c0)
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>
fixed merge conflict
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch | 34 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2h.bb | 1 |
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 @@ | |||
1 | From e427748f3bb5d37e78dc8d70a558c373aa8ababb Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 19 Sep 2016 22:06:28 -0700 | ||
4 | Subject: [PATCH] util/perlpath.pl: make it work when cwd is not in @INC | ||
5 | |||
6 | Fixed 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 | |||
9 | The find.pl is added by oe-core, so once openssl/find.pl is removed, | ||
10 | then this patch can be dropped. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE-Specific] | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | util/perlpath.pl | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/util/perlpath.pl b/util/perlpath.pl | ||
20 | index 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 | -- | ||
33 | 2.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 ea0fa5de35..e877947ebe 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb | |||
@@ -52,6 +52,7 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \ | |||
52 | file://CVE-2016-6306.patch \ | 52 | file://CVE-2016-6306.patch \ |
53 | file://CVE-2016-8610.patch \ | 53 | file://CVE-2016-8610.patch \ |
54 | file://CVE-2016-2177.patch \ | 54 | file://CVE-2016-2177.patch \ |
55 | file://openssl-util-perlpath.pl-cwd.patch \ | ||
55 | " | 56 | " |
56 | SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0" | 57 | SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0" |
57 | SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" | 58 | SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" |