diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-10-22 00:47:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-10-22 00:54:05 +0200 |
| commit | 050cb8f83db24d66e6d06b5e14dddac7c182f8e0 (patch) | |
| tree | c70f3feacd1418a6f37b4282a45ccc622658bfe2 /recipes-connectivity/openssl/openssl/afalg.patch | |
| parent | 9befc0f9fb2080b8f2a55717c1a69c72a00c14a7 (diff) | |
openssl: backport 1.1.1d
Packport openssl 1.1.1d from upstream openembedded-core master commit
8b4edb8552b2 ("openssl: Enable os option for with-rand-seed as well")
reverting commit a4032f3cc5de ("openssl: fix multilib file install
conflicts") due to Rocko incompatibility.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'recipes-connectivity/openssl/openssl/afalg.patch')
| -rw-r--r-- | recipes-connectivity/openssl/openssl/afalg.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-connectivity/openssl/openssl/afalg.patch b/recipes-connectivity/openssl/openssl/afalg.patch new file mode 100644 index 0000000..b7c0e96 --- /dev/null +++ b/recipes-connectivity/openssl/openssl/afalg.patch @@ -0,0 +1,31 @@ +Don't refuse to build afalgeng if cross-compiling or the host kernel is too old. + +Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/Configure b/Configure +index 3baa8ce..9ef52ed 100755 +--- a/Configure ++++ b/Configure +@@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"}) + unless ($disabled{afalgeng}) { + $config{afalgeng}=""; + if (grep { $_ eq 'afalgeng' } @{$target{enable}}) { +- my $minver = 4*10000 + 1*100 + 0; +- if ($config{CROSS_COMPILE} eq "") { +- my $verstr = `uname -r`; +- my ($ma, $mi1, $mi2) = split("\\.", $verstr); +- ($mi2) = $mi2 =~ /(\d+)/; +- my $ver = $ma*10000 + $mi1*100 + $mi2; +- if ($ver < $minver) { +- disable('too-old-kernel', 'afalgeng'); +- } else { +- push @{$config{engdirs}}, "afalg"; +- } +- } else { +- disable('cross-compiling', 'afalgeng'); +- } ++ push @{$config{engdirs}}, "afalg"; + } else { + disable('not-linux', 'afalgeng'); + } |