summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-08-22 18:51:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 18:02:23 +0100
commitf54806852be0a5308bcf0ba87e1e835c38304c43 (patch)
treeca9643254be05278f6ddfecac4895b0d793e413b
parent9b0bc119b742627d52289708ddb97c28c4e11677 (diff)
downloadpoky-f54806852be0a5308bcf0ba87e1e835c38304c43.tar.gz
openssl: remove dependency on relative_symlinks class
Although the relative_symlinks class converts any absolute symlinks in ${D} into relative symlinks automatically, it's a little clearer to create relative symlinks directly where possible. (From OE-Core rev: 959b4d30b5b11e4a098654b0d4469bbdf01b3812) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2p.bb11
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0i.bb11
2 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
index 1abf8942a6..dbcb000a26 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
@@ -58,7 +58,7 @@ SRC_URI[sha256sum] = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c
58 58
59UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar" 59UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
60 60
61inherit pkgconfig siteinfo multilib_header ptest relative_symlinks manpages 61inherit pkgconfig siteinfo multilib_header ptest manpages
62 62
63PACKAGECONFIG ?= "cryptodev-linux" 63PACKAGECONFIG ?= "cryptodev-linux"
64PACKAGECONFIG_class-native = "" 64PACKAGECONFIG_class-native = ""
@@ -242,9 +242,12 @@ do_install () {
242 ${D}${libdir}/ssl/private \ 242 ${D}${libdir}/ssl/private \
243 ${D}${libdir}/ssl/openssl.cnf \ 243 ${D}${libdir}/ssl/openssl.cnf \
244 ${D}${sysconfdir}/ssl/ 244 ${D}${sysconfdir}/ssl/
245 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs 245
246 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private 246 # Although absolute symlinks would be OK for the target, they become
247 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf 247 # invalid if native or nativesdk are relocated from sstate.
248 ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl/certs
249 ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl/private
250 ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl/openssl.cnf
248 251
249 # Rename man pages to prefix openssl10-* 252 # Rename man pages to prefix openssl10-*
250 for f in `find ${D}${mandir} -type f`; do 253 for f in `find ${D}${mandir} -type f`; do
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
index d2f2624f9e..a03f6ff336 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0i.bb
@@ -24,7 +24,7 @@ SRC_URI_append_class-nativesdk = " \
24SRC_URI[md5sum] = "9495126aafd2659d357ea66a969c3fe1" 24SRC_URI[md5sum] = "9495126aafd2659d357ea66a969c3fe1"
25SRC_URI[sha256sum] = "ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99" 25SRC_URI[sha256sum] = "ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99"
26 26
27inherit lib_package multilib_header ptest relative_symlinks 27inherit lib_package multilib_header ptest
28 28
29#| ./libcrypto.so: undefined reference to `getcontext' 29#| ./libcrypto.so: undefined reference to `getcontext'
30#| ./libcrypto.so: undefined reference to `setcontext' 30#| ./libcrypto.so: undefined reference to `setcontext'
@@ -114,9 +114,12 @@ do_install () {
114 ${D}${libdir}/ssl-1.1/private \ 114 ${D}${libdir}/ssl-1.1/private \
115 ${D}${libdir}/ssl-1.1/openssl.cnf \ 115 ${D}${libdir}/ssl-1.1/openssl.cnf \
116 ${D}${sysconfdir}/ssl/ 116 ${D}${sysconfdir}/ssl/
117 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs 117
118 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private 118 # Although absolute symlinks would be OK for the target, they become
119 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf 119 # invalid if native or nativesdk are relocated from sstate.
120 ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs
121 ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private
122 ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf
120} 123}
121 124
122do_install_append_class-native () { 125do_install_append_class-native () {