diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-08-29 16:43:47 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-04 11:03:56 +0100 |
commit | 235e7945190d4a8e99cbdd79ea276936a5fb90f1 (patch) | |
tree | ad595b821cfbf2380453dc29d489357b0fae9a78 | |
parent | da0ce5d365965a2adf91570df9c51289e50abdc1 (diff) | |
download | poky-235e7945190d4a8e99cbdd79ea276936a5fb90f1.tar.gz |
openssl: do not tweak so names, use PRIVATE_LIBS instead
The tweaking was not sufficient to prevent package dependency issues,
but there is a standard mechanism to do exactly that kind of prevention
which I wasn't aware of.
(From OE-Core rev: 1e75fead42f27723e720686f5a5233dc5acbe5b3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb index 1917c3301f..3f4e19f296 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb | |||
@@ -149,14 +149,10 @@ do_install_append_class-nativesdk () { | |||
149 | 149 | ||
150 | do_install_ptest () { | 150 | do_install_ptest () { |
151 | cp -r * ${D}${PTEST_PATH} | 151 | cp -r * ${D}${PTEST_PATH} |
152 | |||
153 | # Putting .so files in ptest package will mess up the dependencies of the main openssl package | ||
154 | # so we rename them to .so.ptest and patch the test accordingly | ||
155 | mv ${D}${PTEST_PATH}/libcrypto.so ${D}${PTEST_PATH}/libcrypto.so.ptest | ||
156 | mv ${D}${PTEST_PATH}/libssl.so ${D}${PTEST_PATH}/libssl.so.ptest | ||
157 | sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t | ||
158 | } | 152 | } |
159 | 153 | ||
154 | PRIVATE_LIBS_${PN}-ptest = "libcrypto.so.1.1 libssl.so.1.1" | ||
155 | |||
160 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto | 156 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto |
161 | # package RRECOMMENDS on this package. This will enable the configuration | 157 | # package RRECOMMENDS on this package. This will enable the configuration |
162 | # file to be installed for both the openssl-bin package and the libcrypto | 158 | # file to be installed for both the openssl-bin package and the libcrypto |