Re: [OE-core] [PATCH] openssl: fix ptest issues

[wenzong fan]

Ping ...

Thanks
Wenzong

On 08/03/2015 04:52 PM, wenzong@windriver.com wrote:

From: Wenzong Fan 

* follow symbolic links while copying sources from test/*
* install required target files to remove Make errors:

   make[2]: *** No rule to make target 'xxx', needed by 'yyy'.

* fix hardcode pathes:
   /usr/lib -> ${libdir}, /usr/bin -> ${bindir}

Signed-off-by: Wenzong Fan 
---
  meta/recipes-connectivity/openssl/openssl.inc | 14 ++
  1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc 
b/meta/recipes-connectivity/openssl/openssl.inc
index 53dcfd9..8d62915 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -191,12 +191,18 @@ do_install () {
  }

  do_install_ptest () {
-   cp -r Makefile test ${D}${PTEST_PATH}
+   cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
+   cp Configure config e_os.h ${D}${PTEST_PATH}
+   cp -r -L include ${D}${PTEST_PATH}
+   ln -sf ${base_libdir}/libcrypto.a ${D}${PTEST_PATH}
+   ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH}
+   mkdir -p ${D}${PTEST_PATH}/crypto
+   cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto
cp -r certs ${D}${PTEST_PATH}
mkdir -p ${D}${PTEST_PATH}/apps
-   ln -sf /usr/lib/ssl/misc/CA.sh  ${D}${PTEST_PATH}/apps
-   ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
-   ln -sf /usr/bin/openssl ${D}${PTEST_PATH}/apps
+   ln -sf ${libdir}/ssl/misc/CA.sh  ${D}${PTEST_PATH}/apps
+   ln -sf ${libdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
+   ln -sf ${bindir}/openssl ${D}${PTEST_PATH}/apps
cp apps/server2.pem ${D}${PTEST_PATH}/apps
mkdir -p ${D}${PTEST_PATH}/util
install util/opensslwrap.sh${D}${PTEST_PATH}/util


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] openssl: fix ptest issues

[wenzong.fan]

From: Wenzong Fan wenzong@windriver.com

* follow symbolic links while copying sources from test/*
* install required target files to remove Make errors:

  make[2]: *** No rule to make target 'xxx', needed by 'yyy'.

* fix hardcode pathes:
  /usr/lib - ${libdir}, /usr/bin - ${bindir}

Signed-off-by: Wenzong Fan wenzong@windriver.com
---
 meta/recipes-connectivity/openssl/openssl.inc | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc 
b/meta/recipes-connectivity/openssl/openssl.inc
index 53dcfd9..8d62915 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -191,12 +191,18 @@ do_install () {
 }
 
 do_install_ptest () {
-   cp -r Makefile test ${D}${PTEST_PATH}
+   cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
+   cp Configure config e_os.h ${D}${PTEST_PATH}
+   cp -r -L include ${D}${PTEST_PATH}
+   ln -sf ${base_libdir}/libcrypto.a ${D}${PTEST_PATH}
+   ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH}
+   mkdir -p ${D}${PTEST_PATH}/crypto
+   cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto
cp -r certs ${D}${PTEST_PATH}
mkdir -p ${D}${PTEST_PATH}/apps
-   ln -sf /usr/lib/ssl/misc/CA.sh  ${D}${PTEST_PATH}/apps
-   ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
-   ln -sf /usr/bin/openssl ${D}${PTEST_PATH}/apps
+   ln -sf ${libdir}/ssl/misc/CA.sh  ${D}${PTEST_PATH}/apps
+   ln -sf ${libdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
+   ln -sf ${bindir}/openssl ${D}${PTEST_PATH}/apps
cp apps/server2.pem ${D}${PTEST_PATH}/apps
mkdir -p ${D}${PTEST_PATH}/util
install util/opensslwrap.sh${D}${PTEST_PATH}/util
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core