]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssl: do not tweak so names, use PRIVATE_LIBS instead
authorAlexander Kanavin <alex.kanavin@gmail.com>
Wed, 29 Aug 2018 14:43:47 +0000 (16:43 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 4 Sep 2018 10:03:31 +0000 (11:03 +0100)
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.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb

index 1917c3301f640f9294d7cf71642a687a3d2ea1f9..3f4e19f296391c01cb8d693bb791a11df4680425 100644 (file)
@@ -149,14 +149,10 @@ do_install_append_class-nativesdk () {
 
 do_install_ptest () {
        cp -r * ${D}${PTEST_PATH}
-
-       # Putting .so files in ptest package will mess up the dependencies of the main openssl package
-       # so we rename them to .so.ptest and patch the test accordingly
-       mv ${D}${PTEST_PATH}/libcrypto.so ${D}${PTEST_PATH}/libcrypto.so.ptest
-       mv ${D}${PTEST_PATH}/libssl.so ${D}${PTEST_PATH}/libssl.so.ptest
-       sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
 }
 
+PRIVATE_LIBS_${PN}-ptest = "libcrypto.so.1.1 libssl.so.1.1"
+
 # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
 # package RRECOMMENDS on this package. This will enable the configuration
 # file to be installed for both the openssl-bin package and the libcrypto