diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2018-07-17 11:10:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 09:49:38 +0100 |
commit | b4376c92ee56835220cfd8ce22fc39f7e26da150 (patch) | |
tree | 241f10baf56504777edb0e25ef5bd01a521a4201 | |
parent | 97901ab12071017b7d2fe755192ae8354424087e (diff) | |
download | poky-b4376c92ee56835220cfd8ce22fc39f7e26da150.tar.gz |
openssl-1.1: /etc/ssl location compatibility
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>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 |
1 files 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 4f80a807cd..8b3d92203f 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | |||
@@ -24,7 +24,7 @@ SRC_URI_append_class-nativesdk = " \ | |||
24 | SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24" | 24 | SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24" |
25 | SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" | 25 | SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" |
26 | 26 | ||
27 | inherit lib_package multilib_header ptest | 27 | inherit lib_package multilib_header ptest relative_symlinks |
28 | 28 | ||
29 | #| engines/afalg/e_afalg.c: In function 'eventfd': | 29 | #| engines/afalg/e_afalg.c: In function 'eventfd': |
30 | #| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) | 30 | #| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) |
@@ -135,6 +135,18 @@ do_configure () { | |||
135 | do_install () { | 135 | do_install () { |
136 | oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install | 136 | oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install |
137 | oe_multilib_header openssl/opensslconf.h | 137 | oe_multilib_header openssl/opensslconf.h |
138 | |||
139 | # Create SSL structure for PATH hard-coded packages like ca-certificates | ||
140 | # Debian is also using this technique | ||
141 | install -d ${D}${sysconfdir}/ssl/ | ||
142 | mv ${D}${libdir}/ssl-1.1/openssl.cnf \ | ||
143 | ${D}${libdir}/ssl-1.1/certs \ | ||
144 | ${D}${libdir}/ssl-1.1/private \ | ||
145 | \ | ||
146 | ${D}${sysconfdir}/ssl/ | ||
147 | ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs | ||
148 | ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private | ||
149 | ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf | ||
138 | } | 150 | } |
139 | 151 | ||
140 | do_install_append_class-native () { | 152 | do_install_append_class-native () { |
@@ -171,8 +183,8 @@ FILES_${PN}-engines = "${libdir}/engines-1.1" | |||
171 | FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" | 183 | FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" |
172 | RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" | 184 | RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" |
173 | 185 | ||
174 | FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" | 186 | FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf" |
175 | CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" | 187 | CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" |
176 | RRECOMMENDS_libcrypto += "openssl-conf" | 188 | RRECOMMENDS_libcrypto += "openssl-conf" |
177 | 189 | ||
178 | RDEPENDS_${PN}-bin = "perl" | 190 | RDEPENDS_${PN}-bin = "perl" |