summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-08 18:30:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:38 +0100
commite326733d69181a03af7a4f837ea78fce348fdf00 (patch)
treef2b049b04bf94693ad017ac68df139b4ed655c65 /meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
parent04891b31e62f37e692647399fa3534d3dd4ab7f9 (diff)
downloadpoky-e326733d69181a03af7a4f837ea78fce348fdf00.tar.gz
openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will continue to be provided for as long as upstream supports it (and there are still several recipes which do not work with openssl 1.1 due to API differences). A few files (such as openssl binary) are no longer installed by openssl 1.0, because they clash with openssl 1.1. (From OE-Core rev: da1183f9fa5e06fbe66b5b31eb3313d5d35d11e3) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch34
1 files changed, 0 insertions, 34 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
deleted file mode 100644
index 065b9b122a..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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