summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-02-21 23:03:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:39 (GMT)
commitef29851fe843847ec27598b4cb199a48923b9391 (patch)
treea90c66a6d2e3a1fc75d044949862528182b4bf8b /meta/recipes-connectivity/openssl
parent136d9cd07d1c2ad316cd59b8fd95b772698e1be2 (diff)
downloadpoky-ef29851fe843847ec27598b4cb199a48923b9391.tar.gz
openssl: Move libcrypto to base_libdir
This fix is for dhclient. It needs libcrypto at runtime and if libcrypto is in libdir, it's path can be inaccessible on systems where /usr is on nfs for example or dhclient is needed before /usr is mounted. (From OE-Core rev: 01ea85f7f6c53c66c76d6f832518b28bf06ec072) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> [Fix comment to from /usr -> /lib - sgw] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc10
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.0g.bb2
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 771f146..089b9a4 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -36,10 +36,11 @@ export AS = "${CC} -c"
36inherit pkgconfig siteinfo 36inherit pkgconfig siteinfo
37 37
38PACKAGES =+ "libcrypto libssl ${PN}-misc" 38PACKAGES =+ "libcrypto libssl ${PN}-misc"
39FILES_libcrypto = "${libdir}/libcrypto.so.*" 39FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
40FILES_libssl = "${libdir}/libssl.so.*" 40FILES_libssl = "${libdir}/libssl.so.*"
41FILES_${PN} =+ " ${libdir}/ssl/*" 41FILES_${PN} =+ " ${libdir}/ssl/*"
42FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf" 42FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf"
43FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
43 44
44do_configure_prepend_darwin () { 45do_configure_prepend_darwin () {
45 sed -i -e '/version-script=openssl\.ld/d' Configure 46 sed -i -e '/version-script=openssl\.ld/d' Configure
@@ -132,6 +133,13 @@ do_install () {
132 oe_libinstall -so libcrypto ${D}${libdir} 133 oe_libinstall -so libcrypto ${D}${libdir}
133 oe_libinstall -so libssl ${D}${libdir} 134 oe_libinstall -so libssl ${D}${libdir}
134 135
136 # Moving libcrypto to /lib
137 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
138 mkdir -p ${D}/${base_libdir}/
139 mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/
140 sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc
141 fi
142
135 install -d ${D}${includedir} 143 install -d ${D}${includedir}
136 cp --dereference -R include/openssl ${D}${includedir} 144 cp --dereference -R include/openssl ${D}${includedir}
137 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl 145 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
index 80dfcb3..8ffe931 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
6 6
7CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" 7CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
8 8
9PR = "${INC_PR}.0" 9PR = "${INC_PR}.1"
10 10
11LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
12 12