[oe] [PATCH 1/3] Backport openssl-1.0.0e from meta-openembedded
Paul Menzel
paulepanter at users.sourceforge.net
Wed Oct 19 20:43:10 UTC 2011
Dear Ulf,
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb ulf_samuelsson at telia.com:
> From: Ulf Samuelsson <ulf_samuelsson at telia.com>
please amend the commit summary and make it compliant to our commit
policy [1].
openssl: Add version 1.0.0e (backport from meta-openembedded)
Please also include the revision or URL to the commit you took this
from.
I am build testing this right now. For easier review it would be nice if
you could add this information to the commit message too.
> Signed-off-by: Ulf Samuelsson <ulf.samuelsson at telia.com>
>
> ---
> .../include/angstrom-2010-preferred-versions.inc | 4 +-
> .../openssl/openssl-1.0.0e/configure-targets.patch | 31 +
> .../openssl-1.0.0e/debian/c_rehash-compat.patch | 43 +
> recipes/openssl/openssl-1.0.0e/debian/ca.patch | 20 +
> .../openssl-1.0.0e/debian/debian-targets.patch | 52 +
> .../openssl-1.0.0e/debian/make-targets.patch | 13 +
> .../openssl/openssl-1.0.0e/debian/man-dir.patch | 13 +
> .../openssl-1.0.0e/debian/man-section.patch | 32 +
> .../openssl/openssl-1.0.0e/debian/no-rpath.patch | 13 +
> .../openssl-1.0.0e/debian/no-symbolic.patch | 13 +
> recipes/openssl/openssl-1.0.0e/debian/pic.patch | 240 ++
> .../openssl/openssl-1.0.0e/debian/pkg-config.patch | 34 +
> .../openssl-1.0.0e/debian/version-script.patch | 4509 ++++++++++++++++++++
> .../engines-install-in-libdir-ssl.patch | 53 +
> recipes/openssl/openssl-1.0.0e/oe-ldflags.patch | 22 +
> .../openssl/openssl-1.0.0e/openssl-fix-link.patch | 35 +
> .../openssl/openssl-1.0.0e/parallel-make-fix.patch | 20 +
> recipes/openssl/openssl-1.0.0e/shared-libs.patch | 48 +
> recipes/openssl/openssl-native_1.0.0e.bb | 39 +
> recipes/openssl/openssl.inc | 9 +-
> recipes/openssl/openssl_1.0.0e.bb | 46 +
> 21 files changed, 5284 insertions(+), 5 deletions(-)
> create mode 100644 recipes/openssl/openssl-1.0.0e/configure-targets.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/ca.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/debian-targets.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/make-targets.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/man-dir.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/man-section.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/no-rpath.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/no-symbolic.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/pic.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/pkg-config.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/debian/version-script.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/oe-ldflags.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/openssl-fix-link.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/parallel-make-fix.patch
> create mode 100644 recipes/openssl/openssl-1.0.0e/shared-libs.patch
> create mode 100644 recipes/openssl/openssl-native_1.0.0e.bb
> create mode 100644 recipes/openssl/openssl_1.0.0e.bb
[…]
> diff --git a/recipes/openssl/openssl-native_1.0.0e.bb b/recipes/openssl/openssl-native_1.0.0e.bb
> new file mode 100644
> index 0000000..8be5bcb
> --- /dev/null
> +++ b/recipes/openssl/openssl-native_1.0.0e.bb
> @@ -0,0 +1,39 @@
> +require openssl.inc
> +
> +inherit pkgconfig native
> +
> +SRC_URI[src.md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86"
> +SRC_URI[src.sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7"
> +PR = "${INC_PR}.0"
> +
> +DEFAULT_PREFERENCE = "-1"
This seems strange, since this is not set in the “normal” recipe.
> +export DIRS = "crypto ssl apps engines"
> +
> +# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
> +export FULL_OPTIMIZATION = " "
> +export BUILD_OPTIMIZATION = " "
> +
> +SRC_URI += "file://configure-targets.patch \
> + file://shared-libs.patch \
> + file://oe-ldflags.patch \
> + file://engines-install-in-libdir-ssl.patch \
> + file://openssl-fix-link.patch \
> + file://debian/version-script.patch \
> + file://debian/pic.patch \
> + file://debian/c_rehash-compat.patch \
> + file://debian/ca.patch \
> + file://debian/make-targets.patch \
> + file://debian/no-rpath.patch \
> + file://debian/man-dir.patch \
> + file://debian/man-section.patch \
> + file://debian/pkg-config.patch \
> + file://debian/no-symbolic.patch \
> + file://debian/debian-targets.patch \
> + "
> +
> +PARALLEL_MAKE = ""
> +
> +CFLAG += " -Wa,--noexecstack "
> +
> +NATIVE_INSTALL_WORKS = "1"
> diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
> index 2460913..2aff24a 100644
> --- a/recipes/openssl/openssl.inc
> +++ b/recipes/openssl/openssl.inc
> @@ -1,14 +1,17 @@
> DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
> HOMEPAGE = "http://www.openssl.org/"
> -LICENSE = "openssl"
> SECTION = "libs/network"
>
> +# "openssl | SSLeay" dual license
> +LICENSE = "openssl"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
> +
> SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz;name=src"
> S = "${WORKDIR}/openssl-${PV}"
>
> inherit siteinfo
>
> -INC_PR = "r14"
> +INC_PR = "r15"
>
> AR_append = " r"
> CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
> @@ -97,7 +100,7 @@ do_configure () {
> # inject machine-specific flags
> sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
> useprefix=${prefix}
> - if [ "x$useprefix" = "x" ]; then
> + if [ "x$useprefix" == "x" ]; then
> useprefix=/
> fi
> perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target
> diff --git a/recipes/openssl/openssl_1.0.0e.bb b/recipes/openssl/openssl_1.0.0e.bb
> new file mode 100644
> index 0000000..907523b
> --- /dev/null
> +++ b/recipes/openssl/openssl_1.0.0e.bb
> @@ -0,0 +1,46 @@
> +inherit pkgconfig
> +
> +require openssl.inc
> +
> +# For target side versions of openssl enable support for OCF Linux driver
> +# if they are available.
> +DEPENDS += "ocf-linux"
> +CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
> +
> +SRC_URI[src.md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86"
> +SRC_URI[src.sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7"
> +
> +PR = "${INC_PR}.0"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
> +
> +export DIRS = "crypto ssl apps engines"
> +export OE_LDFLAGS="${LDFLAGS}"
> +
> +SRC_URI += "file://configure-targets.patch \
> + file://shared-libs.patch \
> + file://oe-ldflags.patch \
> + file://engines-install-in-libdir-ssl.patch \
> + file://openssl-fix-link.patch \
> + file://debian/version-script.patch \
> + file://debian/pic.patch \
> + file://debian/c_rehash-compat.patch \
> + file://debian/ca.patch \
> + file://debian/make-targets.patch \
> + file://debian/no-rpath.patch \
> + file://debian/man-dir.patch \
> + file://debian/man-section.patch \
> + file://debian/pkg-config.patch \
> + file://debian/no-symbolic.patch \
> + file://debian/debian-targets.patch \
> + "
> +
> +PARALLEL_MAKE = ""
> +
> +PACKAGES += " \
> + ${PN}-engines \
> + ${PN}-engines-dbg \
> + "
> +
> +FILES_${PN}-engines = "${libdir}/ssl/engines/*.so"
> +FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
Thanks,
Paul
[1] http://www.openembedded.org/wiki/Commit_Policy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20111019/f1d2141f/attachment-0002.sig>
More information about the Openembedded-devel
mailing list