diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2018-08-22 18:51:31 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 18:02:19 +0100 |
| commit | 959b4d30b5b11e4a098654b0d4469bbdf01b3812 (patch) | |
| tree | bbc9379183a2299ab9418d8d69aa2eee3a13fcc5 | |
| parent | f1a1b31add242380490023c2ee7eec1b4fbcd85b (diff) | |
| download | openembedded-core-contrib-959b4d30b5b11e4a098654b0d4469bbdf01b3812.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.
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.bb | 11 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.0i.bb | 11 |
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 UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar" -inherit pkgconfig siteinfo multilib_header ptest relative_symlinks manpages +inherit pkgconfig siteinfo multilib_header ptest manpages PACKAGECONFIG ?= "cryptodev-linux" PACKAGECONFIG_class-native = "" @@ -242,9 +242,12 @@ do_install () { ${D}${libdir}/ssl/private \ ${D}${libdir}/ssl/openssl.cnf \ ${D}${sysconfdir}/ssl/ - ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs - ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private - ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf + + # Although absolute symlinks would be OK for the target, they become + # invalid if native or nativesdk are relocated from sstate. + ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl/certs + ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl/private + ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl/openssl.cnf # Rename man pages to prefix openssl10-* 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 = " \ SRC_URI[md5sum] = "9495126aafd2659d357ea66a969c3fe1" SRC_URI[sha256sum] = "ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99" -inherit lib_package multilib_header ptest relative_symlinks +inherit lib_package multilib_header ptest #| ./libcrypto.so: undefined reference to `getcontext' #| ./libcrypto.so: undefined reference to `setcontext' @@ -114,9 +114,12 @@ do_install () { ${D}${libdir}/ssl-1.1/private \ ${D}${libdir}/ssl-1.1/openssl.cnf \ ${D}${sysconfdir}/ssl/ - ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs - ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private - ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf + + # Although absolute symlinks would be OK for the target, they become + # invalid if native or nativesdk are relocated from sstate. + ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs + ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private + ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf } do_install_append_class-native () { |