Patchwork [V2] openssl.inc: Install c_rehash utility with openssl

login
register
mail settings
Submitter Yasir Khan
Date Dec. 16, 2013, 11:51 a.m.
Message ID <1387194688-11022-1-git-send-email-yasir_khan@mentor.com>
Download mbox | patch
Permalink /patch/63395/
State New
Headers show

Comments

Yasir Khan - Dec. 16, 2013, 11:51 a.m.
From: mykhani <yasir_khan@mentor.com>

c_rehash utility is not being installed with openssl.It conveniently
generates hash and symbolic links based on it for CA certificates
stored locally for SSL based server authentication

Signed-off-by: mykhani <yasir_khan@mentor.com>
---
 meta/recipes-connectivity/openssl/openssl.inc |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
Saul Wold - Dec. 16, 2013, 8:23 p.m.
On 12/16/2013 03:51 AM, Yasir Khan wrote:
> From: mykhani <yasir_khan@mentor.com>
>
> c_rehash utility is not being installed with openssl.It conveniently
> generates hash and symbolic links based on it for CA certificates
> stored locally for SSL based server authentication
>
> Signed-off-by: mykhani <yasir_khan@mentor.com>
> ---
>   meta/recipes-connectivity/openssl/openssl.inc |   11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index 78ff7ae..5cb67df 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -34,10 +34,14 @@ export AS = "${CC} -c"
>   inherit pkgconfig siteinfo multilib_header
>
>   PACKAGES =+ "libcrypto libssl ${PN}-misc"
> +
> +#Adding RDEPENDS for perl scripts
> +RDEPENDS_${PN}-misc +="perl"
> +
>   FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
>   FILES_libssl = "${libdir}/libssl.so.*"
>   FILES_${PN} =+ " ${libdir}/ssl/*"
> -FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf"
> +FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf ${bindir}/c_rehash"
>   FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
>

This patch did not apply cleanly, you might be based on an older version 
of this file.  Please rebase against master.

>   do_configure_prepend_darwin () {
> @@ -148,5 +152,10 @@ do_install () {
>   	oe_multilib_header openssl/opensslconf.h
>   }
>
> +do_install_append() {
> +    # The c_rehash utility isn't installed by the normal installation process.
> +    install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
> +}
> +
Also, I think this should just be part of the do_install lower in this file.

Sau!

>   BBCLASSEXTEND = "native nativesdk"
>
>

Patch

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 78ff7ae..5cb67df 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -34,10 +34,14 @@  export AS = "${CC} -c"
 inherit pkgconfig siteinfo multilib_header
 
 PACKAGES =+ "libcrypto libssl ${PN}-misc"
+
+#Adding RDEPENDS for perl scripts
+RDEPENDS_${PN}-misc +="perl"
+
 FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl.so.*"
 FILES_${PN} =+ " ${libdir}/ssl/*"
-FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf"
+FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf ${bindir}/c_rehash"
 FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
 
 do_configure_prepend_darwin () {
@@ -148,5 +152,10 @@  do_install () {
 	oe_multilib_header openssl/opensslconf.h
 }
 
+do_install_append() {
+    # The c_rehash utility isn't installed by the normal installation process.
+    install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
+}
+
 BBCLASSEXTEND = "native nativesdk"