diff options
author | Chunrong Guo <chunrong.guo@nxp.com> | 2017-04-18 12:18:44 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-05-02 17:54:58 -0300 |
commit | cfb3ddaaaa78204ef5281c8627eed08f4f7e3f09 (patch) | |
tree | eed52994eb5c9abb844439aefa9faa2328c6b451 /recipes-connectivity/openssl/openssl-qoriq.inc | |
parent | 6e3cc428cfe8c50f38e37161e52a0e63d1f13367 (diff) | |
download | meta-freescale-cfb3ddaaaa78204ef5281c8627eed08f4f7e3f09.tar.gz |
openssl-qoriq: upgrade to 1.0.2k
Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq.inc')
-rw-r--r-- | recipes-connectivity/openssl/openssl-qoriq.inc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc index e3b0e0f9..965291c5 100644 --- a/recipes-connectivity/openssl/openssl-qoriq.inc +++ b/recipes-connectivity/openssl/openssl-qoriq.inc | |||
@@ -47,8 +47,9 @@ PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-conf" | |||
47 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" | 47 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" |
48 | FILES_libssl = "${libdir}/libssl${SOLIBS}" | 48 | FILES_libssl = "${libdir}/libssl${SOLIBS}" |
49 | FILES_${PN} =+ " ${libdir}/ssl/*" | 49 | FILES_${PN} =+ " ${libdir}/ssl/*" |
50 | FILES_${PN}-misc = "${libdir}/ssl/misc" | 50 | FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" |
51 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" | 51 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" |
52 | FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" | ||
52 | 53 | ||
53 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto | 54 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto |
54 | # package RRECOMMENDS on this package. This will enable the configuration | 55 | # package RRECOMMENDS on this package. This will enable the configuration |
@@ -180,18 +181,26 @@ do_install () { | |||
180 | oe_libinstall -so libcrypto ${D}${libdir} | 181 | oe_libinstall -so libcrypto ${D}${libdir} |
181 | oe_libinstall -so libssl ${D}${libdir} | 182 | oe_libinstall -so libssl ${D}${libdir} |
182 | 183 | ||
184 | # Moving libcrypto to /lib | ||
185 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then | ||
186 | mkdir -p ${D}/${base_libdir}/ | ||
187 | mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/ | ||
188 | sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc | ||
189 | fi | ||
190 | |||
183 | install -d ${D}${includedir} | 191 | install -d ${D}${includedir} |
184 | cp --dereference -R include/openssl ${D}${includedir} | 192 | cp --dereference -R include/openssl ${D}${includedir} |
185 | 193 | ||
186 | install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash | ||
187 | sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash | ||
188 | |||
189 | oe_multilib_header openssl/opensslconf.h | 194 | oe_multilib_header openssl/opensslconf.h |
190 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then | 195 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then |
196 | install -m 0755 ${S}/tools/c_rehash ${D}${bindir} | ||
197 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash | ||
191 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl | 198 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl |
192 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget | 199 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget |
193 | else | 200 | # The c_rehash utility isn't installed by the normal installation process. |
194 | rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget | 201 | else |
202 | rm -f ${D}${bindir}/c_rehash | ||
203 | rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget | ||
195 | fi | 204 | fi |
196 | 205 | ||
197 | # Create SSL structure | 206 | # Create SSL structure |
@@ -210,7 +219,7 @@ do_install_ptest () { | |||
210 | cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH} | 219 | cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH} |
211 | cp Configure config e_os.h ${D}${PTEST_PATH} | 220 | cp Configure config e_os.h ${D}${PTEST_PATH} |
212 | cp -r -L include ${D}${PTEST_PATH} | 221 | cp -r -L include ${D}${PTEST_PATH} |
213 | ln -sf ${libdir}/libcrypto.a ${D}${PTEST_PATH} | 222 | ln -sf ${base_libdir}/libcrypto.a ${D}${PTEST_PATH} |
214 | ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH} | 223 | ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH} |
215 | mkdir -p ${D}${PTEST_PATH}/crypto | 224 | mkdir -p ${D}${PTEST_PATH}/crypto |
216 | cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto | 225 | cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto |