aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
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:03 +0000
commit5c3ec044838e23539f9fe4cc74da4db2e5b59166 (patch)
tree3e8b1845de5934d0f887559e47a282b20fc5da92 /meta/recipes-connectivity
parent9844b5e2a544b2c2f76aac497c3a2cdfcc46577c (diff)
downloadopenembedded-core-contrib-5c3ec044838e23539f9fe4cc74da4db2e5b59166.tar.gz
openembedded-core-contrib-5c3ec044838e23539f9fe4cc74da4db2e5b59166.tar.bz2
openembedded-core-contrib-5c3ec044838e23539f9fe4cc74da4db2e5b59166.zip
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) 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>
Diffstat (limited to 'meta/recipes-connectivity')
-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"
inherit pkgconfig siteinfo multilib_header
-PACKAGES =+ "libcrypto libssl ${PN}-misc"
+PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
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"
FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
+# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
+# package RRECOMMENDS on this package. This will enable the configuration
+# file to be installed for both the base openssl package and the libcrypto
+# package since the base openssl package depends on the libcrypto package.
+FILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
+CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
+RRECOMMENDS_libcrypto += "openssl-conf"
+
do_configure_prepend_darwin () {
sed -i -e '/version-script=openssl\.ld/d' Configure
}