diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-18 22:31:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-19 22:15:39 +0100 |
commit | 7a4361c506ac24bafcf294f498d00278f11c3bd4 (patch) | |
tree | 56bbceaba0356a4e447fcdc63d4d35a542629749 /meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch | |
parent | 05a67104676e192e959150eb49902bed82681545 (diff) | |
download | poky-7a4361c506ac24bafcf294f498d00278f11c3bd4.tar.gz |
openssl10: rename back to openssl and make it the default via PREFERRED_VERSION
openssl 1.1 broke 3rd party layers a lot more than was expected; let's flip
the switch at the start of next development cycle.
Add a PROVIDES = "openssl10" to openssl 1.0 recipe; any dependency that is
not compatible with 1.1 should use that in its DEPENDS, as the 1.0
recipe will later be renamed back to openssl10. This does not always work:
http://lists.openembedded.org/pipermail/openembedded-core/2017-August/140957.html
but for many recipes it does.
(From OE-Core rev: 5585103c195104e85ed7ac1455bef91b2e88a04d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch new file mode 100644 index 0000000000..ef6d17934d --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Remove Makefile dependencies for test targets | ||
2 | |||
3 | These are probably here because the executables aren't always built for | ||
4 | other platforms (e.g. Windows); however we can safely assume they'll | ||
5 | always be there. None of the other test targets have such dependencies | ||
6 | and if we don't remove them, make tries to rebuild the executables and | ||
7 | fails during run-ptest. | ||
8 | |||
9 | Upstream-Status: Inappropriate [config] | ||
10 | |||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
12 | |||
13 | Index: openssl-1.0.2/test/Makefile | ||
14 | =================================================================== | ||
15 | --- openssl-1.0.2.orig/test/Makefile | ||
16 | +++ openssl-1.0.2/test/Makefile | ||
17 | @@ -330,7 +330,7 @@ test_cms: ../apps/openssl$(EXE_EXT) cms- | ||
18 | @echo "CMS consistency test" | ||
19 | $(PERL) cms-test.pl | ||
20 | |||
21 | -test_srp: $(SRPTEST)$(EXE_EXT) | ||
22 | +test_srp: | ||
23 | @echo "Test SRP" | ||
24 | ../util/shlib_wrap.sh ./srptest | ||
25 | |||
26 | @@ -342,7 +342,7 @@ test_v3name: $(V3NAMETEST)$(EXE_EXT) | ||
27 | @echo "Test X509v3_check_*" | ||
28 | ../util/shlib_wrap.sh ./$(V3NAMETEST) | ||
29 | |||
30 | -test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) | ||
31 | +test_heartbeat: | ||
32 | ../util/shlib_wrap.sh ./$(HEARTBEATTEST) | ||
33 | |||
34 | test_constant_time: $(CONSTTIMETEST)$(EXE_EXT) | ||