mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

openssl-1.1: /etc/ssl location compatibility

Browse Source 
Some packages have hard-coded path to /etc/ssl location.
Create a symlinks to correct location.

(From OE-Core rev: 87ae1f2de1b033172560e3c89caa06bd9e10d071)

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Marko Peter <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andrej Valek
2018-07-17 11:10:35 +02:00
committed by Richard Purdie
parent 97901ab120
commit b4376c92ee
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+15 -3
View File
@@ -24,7 +24,7 @@ SRC_URI_append_class-nativesdk = " \
SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24" SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24"
SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
inherit lib_package multilib_header ptest inherit lib_package multilib_header ptest relative_symlinks
#| engines/afalg/e_afalg.c: In function 'eventfd': #| engines/afalg/e_afalg.c: In function 'eventfd':
#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) #| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function)
@@ -135,6 +135,18 @@ do_configure () {
do_install () { do_install () {
oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
oe_multilib_header openssl/opensslconf.h 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 () { do_install_append_class-native () {
@@ -171,8 +183,8 @@ FILES_${PN}-engines = "${libdir}/engines-1.1"
FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf"
CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
RRECOMMENDS_libcrypto += "openssl-conf" RRECOMMENDS_libcrypto += "openssl-conf"
RDEPENDS_${PN}-bin = "perl" RDEPENDS_${PN}-bin = "perl"