diff options
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/afalg.patch | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/afalg.patch b/meta/recipes-connectivity/openssl/openssl/afalg.patch new file mode 100644 index 0000000000..7c4b084f3d --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/afalg.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Don't refuse to build afalgeng if cross-compiling or the host kernel is too old. | ||
2 | |||
3 | Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688] | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/Configure b/Configure | ||
7 | index 3baa8ce..9ef52ed 100755 | ||
8 | --- a/Configure | ||
9 | +++ b/Configure | ||
10 | @@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"}) | ||
11 | unless ($disabled{afalgeng}) { | ||
12 | $config{afalgeng}=""; | ||
13 | if (grep { $_ eq 'afalgeng' } @{$target{enable}}) { | ||
14 | - my $minver = 4*10000 + 1*100 + 0; | ||
15 | - if ($config{CROSS_COMPILE} eq "") { | ||
16 | - my $verstr = `uname -r`; | ||
17 | - my ($ma, $mi1, $mi2) = split("\\.", $verstr); | ||
18 | - ($mi2) = $mi2 =~ /(\d+)/; | ||
19 | - my $ver = $ma*10000 + $mi1*100 + $mi2; | ||
20 | - if ($ver < $minver) { | ||
21 | - $disabled{afalgeng} = "too-old-kernel"; | ||
22 | - } else { | ||
23 | - push @{$config{engdirs}}, "afalg"; | ||
24 | - } | ||
25 | - } else { | ||
26 | - $disabled{afalgeng} = "cross-compiling"; | ||
27 | - } | ||
28 | + push @{$config{engdirs}}, "afalg"; | ||
29 | } else { | ||
30 | $disabled{afalgeng} = "not-linux"; | ||
31 | } | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb index 8d5d4b146e..5d19910941 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb | |||
@@ -18,6 +18,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
18 | file://0002-fix-CVE-2018-0734.patch \ | 18 | file://0002-fix-CVE-2018-0734.patch \ |
19 | file://0003-fix-CVE-2018-0735.patch \ | 19 | file://0003-fix-CVE-2018-0735.patch \ |
20 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 20 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
21 | file://afalg.patch \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | SRC_URI_append_class-nativesdk = " \ | 24 | SRC_URI_append_class-nativesdk = " \ |