summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorQiang Chen <qiang.chen@windriver.com>2013-10-28 13:15:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-30 13:39:13 +0000
commit4d3c79df13920b4f095ae12caf43e866318c3143 (patch)
tree4d8d5b1d69e2958a74f54e4974f74d08bcaab44b /meta
parentaf7a27b315e2f853013259258f38d7b64e5c371d (diff)
downloadpoky-4d3c79df13920b4f095ae12caf43e866318c3143.tar.gz
openssl: create package for openssl configuration file
* Add the openssl-conf package to the list of packages to be created. This package contains the openssl.cnf file which is used by both the openssl executable in the openssl package and the libcrypto library. * This is to avoid messages like: WARNING: can't open config file: /usr/lib/ssl/openssl.cnf * When running "openssl req" to request and generate a certificate the command will fail without the openssl.cnf file being installed on the target system. * Made this package an RRECOMMENDS for libcrypto since: * libcrypto is a RDEPENDS for the openssl package * Users can specify a configuration file at another location so it is not stricly required and many commands will work without it (with warnings) (From OE-Core rev: 5c3ec044838e23539f9fe4cc74da4db2e5b59166) Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> Signed-off-by: Qiang Chen <qiang.chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index a3b0ac4c74..3bfe569b3c 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -33,13 +33,21 @@ export AS = "${CC} -c"
33 33
34inherit pkgconfig siteinfo multilib_header 34inherit pkgconfig siteinfo multilib_header
35 35
36PACKAGES =+ "libcrypto libssl ${PN}-misc" 36PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
37FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" 37FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
38FILES_libssl = "${libdir}/libssl.so.*" 38FILES_libssl = "${libdir}/libssl.so.*"
39FILES_${PN} =+ " ${libdir}/ssl/*" 39FILES_${PN} =+ " ${libdir}/ssl/*"
40FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf" 40FILES_${PN}-misc = "${libdir}/ssl/misc"
41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" 41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
42 42
43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
44# package RRECOMMENDS on this package. This will enable the configuration
45# file to be installed for both the base openssl package and the libcrypto
46# package since the base openssl package depends on the libcrypto package.
47FILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
48CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
49RRECOMMENDS_libcrypto += "openssl-conf"
50
43do_configure_prepend_darwin () { 51do_configure_prepend_darwin () {
44 sed -i -e '/version-script=openssl\.ld/d' Configure 52 sed -i -e '/version-script=openssl\.ld/d' Configure
45} 53}