[PATCH 0/1] openssl: don't move libcrypto to base_libdir

[PATCH 0/1] openssl: don't move libcrypto to base_libdir

[Chen Qi]

The following changes since commit e42d8eff9eed7d1454b4f331d96dcee6dea232df:

  bash: Disable custom memory allocator (2015-10-12 14:35:42 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/openssl-libcrypto
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/openssl-libcrypto

Chen Qi (1):
  openssl: don't move libcrypto to base_libdir

 meta/recipes-connectivity/openssl/openssl.inc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

-- 
1.9.1

[PATCH 1/1] openssl: don't move libcrypto to base_libdir

[Chen Qi]

For now, if 'openssl' is enabled for ntp, ntp would still be built
without openssl & libcrypto. This is because that ntp thinks openssl
and libcrypto locates under the same directory.

A patch more than two years ago moves libcrypto from libdir to base_libdir
for the reason of /usr split. And I don't think this reason still stands.

This patch removes the codes of moving libcrypto to base_libdir.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-connectivity/openssl/openssl.inc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 8af423f..0145e3b 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -34,12 +34,12 @@ export AS = "${CC} -c"
 inherit pkgconfig siteinfo multilib_header ptest
 
 PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
-FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
+FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl.so.*"
 FILES_${PN} =+ " ${libdir}/ssl/*"
 FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
 RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
-FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
+FILES_${PN}-dev += "${libdir}/libcrypto${SOLIBSDEV}"
 
 # Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
 # package RRECOMMENDS on this package.  This will enable the configuration
@@ -167,13 +167,6 @@ do_install () {
 	oe_libinstall -so libcrypto ${D}${libdir}
 	oe_libinstall -so libssl ${D}${libdir}
 
-	# Moving libcrypto to /lib
-	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
-		mkdir -p ${D}/${base_libdir}/
-		mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/
-		sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc
-	fi
-
 	install -d ${D}${includedir}
 	cp --dereference -R include/openssl ${D}${includedir}
 
-- 
1.9.1

Re: [PATCH 1/1] openssl: don't move libcrypto to base_libdir

[Phil Blundell]

On Fri, 2015-10-16 at 15:14 +0800, Chen Qi wrote:
> A patch more than two years ago moves libcrypto from libdir to base_libdir
> for the reason of /usr split. And I don't think this reason still stands.

Why not?

p.

Re: [PATCH 1/1] openssl: don't move libcrypto to base_libdir

[ChenQi]

On 10/16/2015 04:28 PM, Phil Blundell wrote:
> On Fri, 2015-10-16 at 15:14 +0800, Chen Qi wrote:
>> A patch more than two years ago moves libcrypto from libdir to base_libdir
>> for the reason of /usr split. And I don't think this reason still stands.
> Why not?
>
> p.
>
>
>
>

1) There are a bunch of /usr split patches on the mailing list and they 
are not accepted.
2) It was moved to /lib because dhclient started before mounting the 
local filesystem on sysvinit.
     Now, mounting local filesystem happens before dhclient in sysvinit.

// Qi