Skip to content

Commit

Permalink
openssl: do not tweak so names, use PRIVATE_LIBS instead
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
  • Loading branch information
kanavin authored and rpurdie committed Sep 4, 2018
1 parent 87acc51 commit 1e75fea
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e75fea

Please sign in to comment.