From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] openssl: Move libcrypto to base_libdir
Date: Tue, 21 Feb 2012 14:24:07 -0800 [thread overview]
Message-ID: <4F441987.2010800@linux.intel.com> (raw)
In-Reply-To: <1328889675-9864-1-git-send-email-andrei@gherzan.ro>
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<andrei@gherzan.ro>
> ---
> ...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<andrei@gherzan.ro>
> +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<andrei@gherzan.ro>
> +---
> + 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"
>
next prev parent reply other threads:[~2012-02-21 22:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 16:01 [PATCH] openssl: Move libcrypto to base_libdir Andrei Gherzan
2012-02-21 22:24 ` Saul Wold [this message]
2012-02-21 22:40 ` Phil Blundell
2012-02-21 22:53 ` Andrei Gherzan
-- strict thread matches above, loose matches on Subject: below --
2012-02-09 18:30 Andrei Gherzan
2012-02-09 18:33 ` Phil Blundell
2012-02-09 19:54 ` Khem Raj
2012-02-10 13:37 ` Phil Blundell
2012-02-09 18:34 ` Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F441987.2010800@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.