[OE-core] [PATCH v4 3/3] openssl-1.1: /etc/ssl location compatibility

[Alexander Kanavin]

No open issues from my side, please resend as Ross probably forgot to
pull it into his staging branch.

Alex

2018-07-09 14:06 GMT+02:00 Andrej Valek <andrej.valek at siemens.com>:
> Hi Alex,
>
> What is the current status of this upgrade? Are there still some open
> points?
>
> Cheers,
> Andrej
>
> On 06/11/18 15:30, Andrej Valek wrote:
>> Some packages have hard-coded path to /etc/ssl location.
>> Create a symlinks to correct location.
>>
>> Signed-off-by: Andrej Valek <andrej.valek at siemens.com>
>> Signed-off-by: Marko Peter <peter.marko at siemens.com>
>> ---
>>  meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 +++++++++++++++---
>>  1 file changed, 15 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
>> index df05f3a2b7..487219b600 100644
>> --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
>> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
>> @@ -22,7 +22,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
>>
>>  S = "${WORKDIR}/openssl-${PV}"
>>
>> -inherit lib_package multilib_header ptest
>> +inherit lib_package multilib_header ptest relative_symlinks
>>
>>  do_configure () {
>>       os=${HOST_OS}
>> @@ -133,6 +133,18 @@ EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC"
>>  do_install () {
>>          oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
>>          oe_multilib_header openssl/opensslconf.h
>> +
>> +        # Create SSL structure for PATH hard-coded packages like ca-certificates
>> +        # Debian is also using this technique
>> +        install -d ${D}${sysconfdir}/ssl/
>> +        mv ${D}${libdir}/ssl-1.1/openssl.cnf \
>> +           ${D}${libdir}/ssl-1.1/certs \
>> +           ${D}${libdir}/ssl-1.1/private \
>> +           \
>> +           ${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
>>  }
>>
>>  do_install_append_class-native () {
>> @@ -163,6 +175,6 @@ FILES_${PN} =+ " ${libdir}/ssl-1.1/*"
>>  FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
>>  RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
>>  FILES_${PN}-engines = "${libdir}/engines-1.1"
>> -FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
>> -CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
>> +FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf"
>> +CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
>>  RRECOMMENDS_libcrypto += "openssl-conf"
>>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core