summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 15:33:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 21:51:51 +0100
commitf30344dd3c066b6d1ac79e0c1905635aa56e94b5 (patch)
tree14915badbb1b5ee76ee97f69884ddf96a95ebdd4
parent11d435684bd330210b8d24481426eef3c5362f84 (diff)
downloadpoky-f30344dd3c066b6d1ac79e0c1905635aa56e94b5.tar.gz
openssl: Ensure perl scripts reference the correct perl
Without this change the perl path from the build system is used. (From OE-Core rev: 1ed8fb66c51ce584c13e592176a69a61bae01f2e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc1
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8r.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 88d5081495..f3ada138ac 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -112,4 +112,5 @@ do_install () {
112 chmod 644 ${D}${libdir}/pkgconfig/openssl.pc 112 chmod 644 ${D}${libdir}/pkgconfig/openssl.pc
113 oe_libinstall -so libcrypto ${D}${libdir} 113 oe_libinstall -so libcrypto ${D}${libdir}
114 oe_libinstall -so libssl ${D}${libdir} 114 oe_libinstall -so libssl ${D}${libdir}
115 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
115} 116}
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
index 54bdcc2f14..5add70eacb 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
@@ -1,6 +1,6 @@
1require openssl.inc 1require openssl.inc
2 2
3PR = "r5" 3PR = "r6"
4SRC_URI += "file://debian/ca.patch \ 4SRC_URI += "file://debian/ca.patch \
5 file://debian/config-hurd.patch;apply=no \ 5 file://debian/config-hurd.patch;apply=no \
6 file://debian/debian-targets.patch \ 6 file://debian/debian-targets.patch \