diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2016-05-23 17:45:25 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-25 07:50:17 +0100 |
commit | 0a84108e0f70da4dce24d1eae05c0d3697e0dc92 (patch) | |
tree | 43222b6108da4ae511b3b23bc799b54e750b91ec /meta/recipes-connectivity/openssl/openssl.inc | |
parent | 1cdd9795dd71d212e01fc5a757e6c9d2b5a08770 (diff) | |
download | poky-0a84108e0f70da4dce24d1eae05c0d3697e0dc92.tar.gz |
openssl: Add Shell-Script based c_rehash utility
The PLD Linux distribution has ported the c_rehash[1] utility from Perl
to Shell-Script, allowing it to be shipped by default.
1. https://git.pld-linux.org/?p=packages/openssl.git;a=blob;f=openssl-c_rehash.sh;h=0ea22637ee6dbce845a9e2caf62540aaaf5d0761
The OpenSSL upstream intends[2] to convert the utility for C however
did not yet finished the conversion.
2. https://rt.openssl.org/Ticket/Display.html?id=2324
This patch adds this script and thus removed the Perl requirement for
it.
(From OE-Core rev: cb6150f1a779e356f120d5e45c91fda75789970a)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl.inc')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index a5ddf4d4b0..668e34e600 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -36,7 +36,7 @@ PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" | |||
36 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" | 36 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" |
37 | FILES_libssl = "${libdir}/libssl${SOLIBS}" | 37 | FILES_libssl = "${libdir}/libssl${SOLIBS}" |
38 | FILES_${PN} =+ " ${libdir}/ssl/*" | 38 | FILES_${PN} =+ " ${libdir}/ssl/*" |
39 | FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" | 39 | FILES_${PN}-misc = "${libdir}/ssl/misc" |
40 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" | 40 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" |
41 | 41 | ||
42 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto | 42 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto |
@@ -168,15 +168,14 @@ do_install () { | |||
168 | install -d ${D}${includedir} | 168 | install -d ${D}${includedir} |
169 | cp --dereference -R include/openssl ${D}${includedir} | 169 | cp --dereference -R include/openssl ${D}${includedir} |
170 | 170 | ||
171 | install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash | ||
172 | sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash | ||
173 | |||
171 | oe_multilib_header openssl/opensslconf.h | 174 | oe_multilib_header openssl/opensslconf.h |
172 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then | 175 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then |
173 | install -m 0755 ${S}/tools/c_rehash ${D}${bindir} | ||
174 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash | ||
175 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl | 176 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl |
176 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget | 177 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget |
177 | # The c_rehash utility isn't installed by the normal installation process. | ||
178 | else | 178 | else |
179 | rm -f ${D}${bindir}/c_rehash | ||
180 | rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget | 179 | rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget |
181 | fi | 180 | fi |
182 | } | 181 | } |