From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1RzyG3-0003G2-U3 for openembedded-core@lists.openembedded.org; Tue, 21 Feb 2012 23:32:28 +0100 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 21 Feb 2012 14:24:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="110549164" Received: from unknown (HELO [10.255.15.72]) ([10.255.15.72]) by orsmga001.jf.intel.com with ESMTP; 21 Feb 2012 14:24:07 -0800 Message-ID: <4F441987.2010800@linux.intel.com> Date: Tue, 21 Feb 2012 14:24:07 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20120131 Thunderbird/10.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1328889675-9864-1-git-send-email-andrei@gherzan.ro> In-Reply-To: <1328889675-9864-1-git-send-email-andrei@gherzan.ro> Subject: Re: [PATCH] openssl: Move libcrypto to base_libdir X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2012 22:32:28 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 02/10/2012 08:01 AM, Andrei Gherzan wrote: > This fix is for dhclient. It needs libcrypto at runtime and if > libcrypto is in libdir, it's path can be inaccessible on systems > where /usr is on nfs for example or dhclient is needed before > /usr is mounted. > > Signed-off-by: Andrei Gherzan > --- > ...001-openssl-Move-libcrypto-to-base_libdir.patch | 61 ++++++++++++++++++++ > meta/recipes-connectivity/openssl/openssl.inc | 10 +++- > .../recipes-connectivity/openssl/openssl_1.0.0g.bb | 2 +- > 3 files changed, 71 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-connectivity/openssl/0001-openssl-Move-libcrypto-to-base_libdir.patch > > diff --git a/meta/recipes-connectivity/openssl/0001-openssl-Move-libcrypto-to-base_libdir.patch b/meta/recipes-connectivity/openssl/0001-openssl-Move-libcrypto-to-base_libdir.patch > new file mode 100644 > index 0000000..b101d8c > --- /dev/null > +++ b/meta/recipes-connectivity/openssl/0001-openssl-Move-libcrypto-to-base_libdir.patch > @@ -0,0 +1,61 @@ > +From ac1fe1490e997fb8fd91ec13b675d38efcc65775 Mon Sep 17 00:00:00 2001 > +From: Andrei Gherzan > +Date: Thu, 9 Feb 2012 00:03:38 +0200 > +Subject: [PATCH] openssl: Move libcrypto to base_libdir > + > +This fix is for dhclient. It needs libcrypto at runtime and if > +libcrypto is in libdir, it's path can be inaccessible on systems > +where /usr is on nfs for example or dhclient is needed before > +/usr is mounted. > + Seems to be missing Upstream-Status Sau! > +Signed-off-by: Andrei Gherzan > +--- > + meta/recipes-connectivity/openssl/openssl.inc | 8 +++++++- > + .../recipes-connectivity/openssl/openssl_1.0.0g.bb | 2 +- > + 2 files changed, 8 insertions(+), 2 deletions(-) > + > +diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc > +index 771f146..76a28ff 100644 > +--- a/meta/recipes-connectivity/openssl/openssl.inc > ++++ b/meta/recipes-connectivity/openssl/openssl.inc > +@@ -36,10 +36,11 @@ export AS = "${CC} -c" > + inherit pkgconfig siteinfo > + > + PACKAGES =+ "libcrypto libssl ${PN}-misc" > +-FILES_libcrypto = "${libdir}/libcrypto.so.*" > ++FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" > + FILES_libssl = "${libdir}/libssl.so.*" > + FILES_${PN} =+ " ${libdir}/ssl/*" > + FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf" > ++FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" > + > + do_configure_prepend_darwin () { > + sed -i -e '/version-script=openssl\.ld/d' Configure > +@@ -132,6 +133,11 @@ do_install () { > + oe_libinstall -so libcrypto ${D}${libdir} > + oe_libinstall -so libssl ${D}${libdir} > + > ++ # Moving libcrypto to /usr > ++ mkdir -p ${D}/${base_libdir}/ > ++ mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/ > ++ sed -i s/usr// ${D}/${libdir}/pkgconfig/libcrypto.pc > ++ > + install -d ${D}${includedir} > + cp --dereference -R include/openssl ${D}${includedir} > + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl > +diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb > +index 80dfcb3..8ffe931 100644 > +--- a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb > ++++ b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb > +@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux" > + > + CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" > + > +-PR = "${INC_PR}.0" > ++PR = "${INC_PR}.1" > + > + LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" > + > +-- > +1.7.5.4 > + > diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc > index 771f146..eb6c5ea 100644 > --- a/meta/recipes-connectivity/openssl/openssl.inc > +++ b/meta/recipes-connectivity/openssl/openssl.inc > @@ -36,10 +36,11 @@ export AS = "${CC} -c" > inherit pkgconfig siteinfo > > PACKAGES =+ "libcrypto libssl ${PN}-misc" > -FILES_libcrypto = "${libdir}/libcrypto.so.*" > +FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" > FILES_libssl = "${libdir}/libssl.so.*" > FILES_${PN} =+ " ${libdir}/ssl/*" > FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf" > +FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" > > do_configure_prepend_darwin () { > sed -i -e '/version-script=openssl\.ld/d' Configure > @@ -132,6 +133,13 @@ do_install () { > oe_libinstall -so libcrypto ${D}${libdir} > oe_libinstall -so libssl ${D}${libdir} > > + # Moving libcrypto to /usr > + 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} > sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl > diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb > index 80dfcb3..8ffe931 100644 > --- a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb > +++ b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb > @@ -6,7 +6,7 @@ DEPENDS += "ocf-linux" > > CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" > > -PR = "${INC_PR}.0" > +PR = "${INC_PR}.1" > > LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" >