summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc17
1 files changed, 14 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 668e34e600..3412c66101 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -43,8 +43,8 @@ RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '',
43# package RRECOMMENDS on this package. This will enable the configuration 43# package RRECOMMENDS on this package. This will enable the configuration
44# file to be installed for both the base openssl package and the libcrypto 44# file to be installed for both the base openssl package and the libcrypto
45# package since the base openssl package depends on the libcrypto package. 45# package since the base openssl package depends on the libcrypto package.
46FILES_openssl-conf = "${libdir}/ssl/openssl.cnf" 46FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
47CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" 47CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
48RRECOMMENDS_libcrypto += "openssl-conf" 48RRECOMMENDS_libcrypto += "openssl-conf"
49RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" 49RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc"
50 50
@@ -178,6 +178,17 @@ do_install () {
178 else 178 else
179 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
180 fi 180 fi
181
182 # Create SSL structure
183 install -d ${D}${sysconfdir}/ssl/
184 mv ${D}${libdir}/ssl/openssl.cnf \
185 ${D}${libdir}/ssl/certs \
186 ${D}${libdir}/ssl/private \
187 \
188 ${D}${sysconfdir}/ssl/
189 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs
190 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private
191 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf
181} 192}
182 193
183do_install_ptest () { 194do_install_ptest () {
@@ -191,7 +202,7 @@ do_install_ptest () {
191 cp -r certs ${D}${PTEST_PATH} 202 cp -r certs ${D}${PTEST_PATH}
192 mkdir -p ${D}${PTEST_PATH}/apps 203 mkdir -p ${D}${PTEST_PATH}/apps
193 ln -sf ${libdir}/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps 204 ln -sf ${libdir}/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps
194 ln -sf ${libdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps 205 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
195 ln -sf ${bindir}/openssl ${D}${PTEST_PATH}/apps 206 ln -sf ${bindir}/openssl ${D}${PTEST_PATH}/apps
196 cp apps/server2.pem ${D}${PTEST_PATH}/apps 207 cp apps/server2.pem ${D}${PTEST_PATH}/apps
197 mkdir -p ${D}${PTEST_PATH}/util 208 mkdir -p ${D}${PTEST_PATH}/util