Patchwork Modify the path of env in CA.pl to make export-sdk successfully.

login
register
mail settings
Submitter yanjun.zhu
Date Dec. 2, 2013, 7:13 a.m.
Message ID <1385968413-18202-1-git-send-email-yanjun.zhu@windriver.com>
Download mbox | patch
Permalink /patch/62649/
State New
Headers show

Comments

yanjun.zhu - Dec. 2, 2013, 7:13 a.m.
---
 meta/recipes-connectivity/openssl/openssl.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Richard Purdie - Dec. 2, 2013, 1:43 p.m.
On Mon, 2013-12-02 at 15:13 +0800, yzhu1 wrote:
> ---
>  meta/recipes-connectivity/openssl/openssl.inc |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

What is "export-sdk" and how does this break it?

I suspect what we want to do is hardcode /usr/bin/env in here for
nativesdk? We can't/don't want to assume the sdk contains perl.

Cheers,

Richard

> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index 3bfe569..de10d17 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -154,7 +154,7 @@ do_install () {
>  
>  	install -d ${D}${includedir}
>  	cp --dereference -R include/openssl ${D}${includedir}
> -	sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
> +	sed -i -e '1s,^.*$,#! ${bindir}/perl,' ${D}${libdir}/ssl/misc/CA.pl
>  
>  	oe_multilib_header openssl/opensslconf.h
>  }

Patch

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 3bfe569..de10d17 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -154,7 +154,7 @@  do_install () {
 
 	install -d ${D}${includedir}
 	cp --dereference -R include/openssl ${D}${includedir}
-	sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
+	sed -i -e '1s,^.*$,#! ${bindir}/perl,' ${D}${libdir}/ssl/misc/CA.pl
 
 	oe_multilib_header openssl/opensslconf.h
 }