diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-26 15:33:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:37:52 +0000 |
| commit | 058ef489a0283c2bc88a90e74913041e046030f5 (patch) | |
| tree | 7c74e6d66d82ce6d2da8eb0d6ccf419fcfa2c695 /meta | |
| parent | 3eb7e626d00f7fe9b3c734e919cadbdaeb71e789 (diff) | |
| download | poky-058ef489a0283c2bc88a90e74913041e046030f5.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)
(From OE-Core rev: bc7da81942aa5676010d513407a2731bd385a165)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 |
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 @@ | |||
| 1 | require openssl.inc | 1 | require openssl.inc |
| 2 | 2 | ||
| 3 | PR = "r5" | 3 | PR = "r6" |
| 4 | SRC_URI += "file://debian/ca.patch \ | 4 | SRC_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 \ |
