From: Ting Liu <[email protected]> The QorIQ version of openssl needs to use another recipe name and have a common provider, which is than choosen for QorIQ-based machines.
The recipe is now called 'openssl-qoriq' and it provides openssl so the preferrence is set just for QorIQ based machines. Signed-off-by: Ting Liu <[email protected]> --- conf/machine/include/qoriq.inc | 2 +- .../openssl/{openssl.inc => openssl-qoriq.inc} | 12 ++- .../configure-targets.patch | 0 .../debian/c_rehash-compat.patch | 0 .../{openssl => openssl-qoriq}/debian/ca.patch | 0 .../debian/debian-targets.patch | 0 .../debian/make-targets.patch | 0 .../debian/man-dir.patch | 0 .../debian/man-section.patch | 0 .../debian/no-rpath.patch | 0 .../debian/no-symbolic.patch | 0 .../{openssl => openssl-qoriq}/debian/pic.patch | 0 .../debian/version-script.patch | 0 .../engines-install-in-libdir-ssl.patch | 0 .../openssl/{openssl => openssl-qoriq}/find.pl | 0 .../fix-cipher-des-ede3-cfb1.patch | 0 .../initial-aarch64-bits.patch | 0 .../{openssl => openssl-qoriq}/oe-ldflags.patch | 0 ...-pointer-dereference-in-EVP_DigestInit_ex.patch | 0 ...NULL-pointer-dereference-in-dh_pub_encode.patch | 0 .../openssl-fix-des.pod-error.patch | 0 .../openssl-fix-link.patch | 0 .../openssl_fix_for_x32.patch | 0 ...double-initialization-of-cryptodev-engine.patch | 0 ...ev-add-support-for-TLS-algorithms-offload.patch | 0 ...0003-cryptodev-fix-algorithm-registration.patch | 0 ...ake-it-more-robust-and-recognize-KERNEL_B.patch | 0 ...5-ECC-Support-header-for-Cryptodev-Engine.patch | 0 .../0006-Fixed-private-key-support-for-DH.patch | 0 .../0007-Fixed-private-key-support-for-DH.patch | 0 ...itial-support-for-PKC-in-cryptodev-engine.patch | 0 ...009-Added-hwrng-dev-file-as-source-of-RNG.patch | 0 ...s-interface-added-for-PKC-cryptodev-inter.patch | 0 ...gen-operation-and-support-gendsa-command-.patch | 0 .../qoriq}/0012-RSA-Keygen-Fix.patch | 0 .../0013-Removed-local-copy-of-curve_t-type.patch | 0 ...us-parameter-is-not-populated-by-dhparams.patch | 0 .../0015-SW-Backoff-mechanism-for-dsa-keygen.patch | 0 .../0016-Fixed-DH-keygen-pair-generator.patch | 0 ...dd-support-for-aes-gcm-algorithm-offloadi.patch | 0 ...ev-extend-TLS-offload-with-3des_cbc_hmac_.patch | 0 ...ev-add-support-for-TLSv1.1-record-offload.patch | 0 ...ev-add-support-for-TLSv1.2-record-offload.patch | 0 .../0021-cryptodev-drop-redundant-function.patch | 0 ...yptodev-do-not-zero-the-buffer-before-use.patch | 0 .../0023-cryptodev-clean-up-code-layout.patch | 0 ...odev-do-not-cache-file-descriptor-in-open.patch | 0 ...cryptodev-put_dev_crypto-should-be-an-int.patch | 0 ...todev-simplify-cryptodev-pkc-support-code.patch | 0 .../{openssl => openssl-qoriq}/shared-libs.patch | 0 .../openssl/openssl-qoriq_1.0.1i.bb | 96 ++++++++++++++++++++++ recipes-connectivity/openssl/openssl_1.0.1i.bb | 53 ------------ .../openssl/openssl_1.0.1i.bbappend | 40 --------- 53 files changed, 108 insertions(+), 95 deletions(-) rename recipes-connectivity/openssl/{openssl.inc => openssl-qoriq.inc} (92%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/configure-targets.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/c_rehash-compat.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/ca.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/debian-targets.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/make-targets.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/man-dir.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/man-section.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/no-rpath.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/no-symbolic.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/pic.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/debian/version-script.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/engines-install-in-libdir-ssl.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/find.pl (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/fix-cipher-des-ede3-cfb1.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/initial-aarch64-bits.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/oe-ldflags.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/openssl-fix-des.pod-error.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/openssl-fix-link.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/openssl_fix_for_x32.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0001-remove-double-initialization-of-cryptodev-engine.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0003-cryptodev-fix-algorithm-registration.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0005-ECC-Support-header-for-Cryptodev-Engine.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0006-Fixed-private-key-support-for-DH.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0007-Fixed-private-key-support-for-DH.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0008-Initial-support-for-PKC-in-cryptodev-engine.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0009-Added-hwrng-dev-file-as-source-of-RNG.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0012-RSA-Keygen-Fix.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0013-Removed-local-copy-of-curve_t-type.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0014-Modulus-parameter-is-not-populated-by-dhparams.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0015-SW-Backoff-mechanism-for-dsa-keygen.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0016-Fixed-DH-keygen-pair-generator.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0021-cryptodev-drop-redundant-function.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0022-cryptodev-do-not-zero-the-buffer-before-use.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0023-cryptodev-clean-up-code-layout.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0025-cryptodev-put_dev_crypto-should-be-an-int.patch (100%) rename recipes-connectivity/openssl/{openssl-fsl => openssl-qoriq/qoriq}/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch (100%) rename recipes-connectivity/openssl/{openssl => openssl-qoriq}/shared-libs.patch (100%) create mode 100644 recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb delete mode 100644 recipes-connectivity/openssl/openssl_1.0.1i.bb delete mode 100644 recipes-connectivity/openssl/openssl_1.0.1i.bbappend diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc index 84b5abb..70cd56b 100644 --- a/conf/machine/include/qoriq.inc +++ b/conf/machine/include/qoriq.inc @@ -6,9 +6,9 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux" PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" +PREFERRED_PROVIDER_openssl = "openssl-qoriq" PREFERRED_VERSION_qemu = "2.4.0+fsl" -PREFERRED_VERSION_openssl = "1.0.1i" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl-qoriq.inc similarity index 92% rename from recipes-connectivity/openssl/openssl.inc rename to recipes-connectivity/openssl/openssl-qoriq.inc index aa1143d..87ba1c3 100644 --- a/recipes-connectivity/openssl/openssl.inc +++ b/recipes-connectivity/openssl/openssl-qoriq.inc @@ -8,6 +8,17 @@ SECTION = "libs/network" LICENSE = "openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" +PROVIDES = "openssl" + +python() { + pkgs = d.getVar('PACKAGES', True).split() + for p in pkgs: + if 'openssl-qoriq' in p: + d.appendVar("RPROVIDES_%s" % p, p.replace('openssl-qoriq', 'openssl')) + d.appendVar("RCONFLICTS_%s" % p, p.replace('openssl-qoriq', 'openssl')) + d.appendVar("RREPLACES_%s" % p, p.replace('openssl-qoriq', 'openssl')) +} + DEPENDS = "perl-native-runtime" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ @@ -171,4 +182,3 @@ do_install () { } BBCLASSEXTEND = "native nativesdk" - diff --git a/recipes-connectivity/openssl/openssl/configure-targets.patch b/recipes-connectivity/openssl/openssl-qoriq/configure-targets.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/configure-targets.patch rename to recipes-connectivity/openssl/openssl-qoriq/configure-targets.patch diff --git a/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch diff --git a/recipes-connectivity/openssl/openssl/debian/ca.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/ca.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/ca.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/ca.patch diff --git a/recipes-connectivity/openssl/openssl/debian/debian-targets.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/debian-targets.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch diff --git a/recipes-connectivity/openssl/openssl/debian/make-targets.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/make-targets.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/make-targets.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/make-targets.patch diff --git a/recipes-connectivity/openssl/openssl/debian/man-dir.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/man-dir.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/man-dir.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/man-dir.patch diff --git a/recipes-connectivity/openssl/openssl/debian/man-section.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/man-section.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/man-section.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/man-section.patch diff --git a/recipes-connectivity/openssl/openssl/debian/no-rpath.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/no-rpath.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/no-rpath.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/no-rpath.patch diff --git a/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/no-symbolic.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/no-symbolic.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/no-symbolic.patch diff --git a/recipes-connectivity/openssl/openssl/debian/pic.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/pic.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/pic.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/pic.patch diff --git a/recipes-connectivity/openssl/openssl/debian/version-script.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/version-script.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/debian/version-script.patch rename to recipes-connectivity/openssl/openssl-qoriq/debian/version-script.patch diff --git a/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch b/recipes-connectivity/openssl/openssl-qoriq/engines-install-in-libdir-ssl.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch rename to recipes-connectivity/openssl/openssl-qoriq/engines-install-in-libdir-ssl.patch diff --git a/recipes-connectivity/openssl/openssl/find.pl b/recipes-connectivity/openssl/openssl-qoriq/find.pl similarity index 100% rename from recipes-connectivity/openssl/openssl/find.pl rename to recipes-connectivity/openssl/openssl-qoriq/find.pl diff --git a/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch rename to recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch diff --git a/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch b/recipes-connectivity/openssl/openssl-qoriq/initial-aarch64-bits.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch rename to recipes-connectivity/openssl/openssl-qoriq/initial-aarch64-bits.patch diff --git a/recipes-connectivity/openssl/openssl/oe-ldflags.patch b/recipes-connectivity/openssl/openssl-qoriq/oe-ldflags.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/oe-ldflags.patch rename to recipes-connectivity/openssl/openssl-qoriq/oe-ldflags.patch diff --git a/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch rename to recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch diff --git a/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch rename to recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch diff --git a/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-fix-des.pod-error.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch rename to recipes-connectivity/openssl/openssl-qoriq/openssl-fix-des.pod-error.patch diff --git a/recipes-connectivity/openssl/openssl/openssl-fix-link.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-fix-link.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/openssl-fix-link.patch rename to recipes-connectivity/openssl/openssl-qoriq/openssl-fix-link.patch diff --git a/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl_fix_for_x32.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch rename to recipes-connectivity/openssl/openssl-qoriq/openssl_fix_for_x32.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0003-cryptodev-fix-algorithm-registration.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0003-cryptodev-fix-algorithm-registration.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0005-ECC-Support-header-for-Cryptodev-Engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0005-ECC-Support-header-for-Cryptodev-Engine.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0006-Fixed-private-key-support-for-DH.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Fixed-private-key-support-for-DH.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0006-Fixed-private-key-support-for-DH.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Fixed-private-key-support-for-DH.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0007-Fixed-private-key-support-for-DH.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Fixed-private-key-support-for-DH.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0007-Fixed-private-key-support-for-DH.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Fixed-private-key-support-for-DH.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0008-Initial-support-for-PKC-in-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0008-Initial-support-for-PKC-in-cryptodev-engine.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0009-Added-hwrng-dev-file-as-source-of-RNG.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0009-Added-hwrng-dev-file-as-source-of-RNG.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0012-RSA-Keygen-Fix.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-RSA-Keygen-Fix.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0012-RSA-Keygen-Fix.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-RSA-Keygen-Fix.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0013-Removed-local-copy-of-curve_t-type.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Removed-local-copy-of-curve_t-type.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0013-Removed-local-copy-of-curve_t-type.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Removed-local-copy-of-curve_t-type.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0014-Modulus-parameter-is-not-populated-by-dhparams.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0014-Modulus-parameter-is-not-populated-by-dhparams.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0015-SW-Backoff-mechanism-for-dsa-keygen.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0015-SW-Backoff-mechanism-for-dsa-keygen.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0016-Fixed-DH-keygen-pair-generator.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-Fixed-DH-keygen-pair-generator.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0016-Fixed-DH-keygen-pair-generator.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-Fixed-DH-keygen-pair-generator.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0021-cryptodev-drop-redundant-function.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-drop-redundant-function.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0021-cryptodev-drop-redundant-function.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-drop-redundant-function.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0022-cryptodev-do-not-zero-the-buffer-before-use.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0022-cryptodev-do-not-zero-the-buffer-before-use.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-clean-up-code-layout.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-clean-up-code-layout.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0025-cryptodev-put_dev_crypto-should-be-an-int.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0025-cryptodev-put_dev_crypto-should-be-an-int.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch diff --git a/recipes-connectivity/openssl/openssl-fsl/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch similarity index 100% rename from recipes-connectivity/openssl/openssl-fsl/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch rename to recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch diff --git a/recipes-connectivity/openssl/openssl/shared-libs.patch b/recipes-connectivity/openssl/openssl-qoriq/shared-libs.patch similarity index 100% rename from recipes-connectivity/openssl/openssl/shared-libs.patch rename to recipes-connectivity/openssl/openssl-qoriq/shared-libs.patch diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb b/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb new file mode 100644 index 0000000..3b9d56e --- /dev/null +++ b/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb @@ -0,0 +1,96 @@ +require openssl-qoriq.inc + +# For target side versions of openssl enable support for cryptodev Linux driver +# if they are available. +DEPENDS_class-target += "cryptodev-linux" +CFLAG_class-target += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + +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/no-symbolic.patch \ + file://debian/debian-targets.patch \ + file://openssl_fix_for_x32.patch \ + file://fix-cipher-des-ede3-cfb1.patch \ + file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ + file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ + file://initial-aarch64-bits.patch \ + file://find.pl \ + file://openssl-fix-des.pod-error.patch \ + " + +SRC_URI_append_class-target = "\ + file://qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch \ + file://qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch \ + file://qoriq/0003-cryptodev-fix-algorithm-registration.patch \ + file://qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch \ + file://qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch \ + file://qoriq/0006-Fixed-private-key-support-for-DH.patch \ + file://qoriq/0007-Fixed-private-key-support-for-DH.patch \ + file://qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch \ + file://qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch \ + file://qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch \ + file://qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch \ + file://qoriq/0012-RSA-Keygen-Fix.patch \ + file://qoriq/0013-Removed-local-copy-of-curve_t-type.patch \ + file://qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch \ + file://qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch \ + file://qoriq/0016-Fixed-DH-keygen-pair-generator.patch \ + file://qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch \ + file://qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch \ + file://qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch \ + file://qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch \ + file://qoriq/0021-cryptodev-drop-redundant-function.patch \ + file://qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch \ + file://qoriq/0023-cryptodev-clean-up-code-layout.patch \ + file://qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch \ + file://qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch \ + file://qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch \ +" + +SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972" +SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7" + +PACKAGES =+ " \ + ${PN}-engines-dbg \ + ${PN}-engines \ +" + +FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" +FILES_${PN}-engines-dbg = "${libdir}/engines/.debug ${libdir}/ssl/engines/.debug" + +PARALLEL_MAKE = "" +PARALLEL_MAKEINST = "" + +# Digest offloading through cryptodev is not recommended because of the +# performance penalty of the Openssl engine interface. Openssl generates a huge +# number of calls to digest functions for even a small amount of work data. +# For example there are 70 calls to cipher code and over 10000 to digest code +# when downloading only 10 files of 700 bytes each. +# Do not build OpenSSL with cryptodev digest support until engine digest +# interface gets some rework: +CFLAG_class-target := "${@'${CFLAG}'.replace('-DUSE_CRYPTODEV_DIGESTS', '')}" + +do_configure_prepend() { + cp ${WORKDIR}/find.pl ${S}/util/find.pl +} + + +RDEPENDS_${PN}_class-target += "cryptodev-module" + +COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-connectivity/openssl/openssl_1.0.1i.bb b/recipes-connectivity/openssl/openssl_1.0.1i.bb deleted file mode 100644 index 9d093ef..0000000 --- a/recipes-connectivity/openssl/openssl_1.0.1i.bb +++ /dev/null @@ -1,53 +0,0 @@ -require openssl.inc - -# For target side versions of openssl enable support for cryptodev Linux driver -# if they are available. -DEPENDS_class-target += "cryptodev-linux" -CFLAG_class-target += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" - -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/no-symbolic.patch \ - file://debian/debian-targets.patch \ - file://openssl_fix_for_x32.patch \ - file://fix-cipher-des-ede3-cfb1.patch \ - file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ - file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ - file://initial-aarch64-bits.patch \ - file://find.pl \ - file://openssl-fix-des.pod-error.patch \ - " - -SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972" -SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7" - -PACKAGES =+ " \ - ${PN}-engines-dbg \ - ${PN}-engines \ -" - -FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" -FILES_${PN}-engines-dbg = "${libdir}/engines/.debug ${libdir}/ssl/engines/.debug" - -PARALLEL_MAKE = "" -PARALLEL_MAKEINST = "" - -do_configure_prepend() { - cp ${WORKDIR}/find.pl ${S}/util/find.pl -} diff --git a/recipes-connectivity/openssl/openssl_1.0.1i.bbappend b/recipes-connectivity/openssl/openssl_1.0.1i.bbappend deleted file mode 100644 index 7b381ff..0000000 --- a/recipes-connectivity/openssl/openssl_1.0.1i.bbappend +++ /dev/null @@ -1,40 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/openssl-fsl:" - -RDEPENDS_${PN}_class-target += "cryptodev-module" - -SRC_URI_append_class-target = " file://0001-remove-double-initialization-of-cryptodev-engine.patch \ - file://0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch \ - file://0003-cryptodev-fix-algorithm-registration.patch \ - file://0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch \ - file://0005-ECC-Support-header-for-Cryptodev-Engine.patch \ - file://0006-Fixed-private-key-support-for-DH.patch \ - file://0007-Fixed-private-key-support-for-DH.patch \ - file://0008-Initial-support-for-PKC-in-cryptodev-engine.patch \ - file://0009-Added-hwrng-dev-file-as-source-of-RNG.patch \ - file://0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch \ - file://0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch \ - file://0012-RSA-Keygen-Fix.patch \ - file://0013-Removed-local-copy-of-curve_t-type.patch \ - file://0014-Modulus-parameter-is-not-populated-by-dhparams.patch \ - file://0015-SW-Backoff-mechanism-for-dsa-keygen.patch \ - file://0016-Fixed-DH-keygen-pair-generator.patch \ - file://0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch \ - file://0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch \ - file://0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch \ - file://0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch \ - file://0021-cryptodev-drop-redundant-function.patch \ - file://0022-cryptodev-do-not-zero-the-buffer-before-use.patch \ - file://0023-cryptodev-clean-up-code-layout.patch \ - file://0024-cryptodev-do-not-cache-file-descriptor-in-open.patch \ - file://0025-cryptodev-put_dev_crypto-should-be-an-int.patch \ - file://0026-cryptodev-simplify-cryptodev-pkc-support-code.patch \ -" - -# Digest offloading through cryptodev is not recommended because of the -# performance penalty of the Openssl engine interface. Openssl generates a huge -# number of calls to digest functions for even a small amount of work data. -# For example there are 70 calls to cipher code and over 10000 to digest code -# when downloading only 10 files of 700 bytes each. -# Do not build OpenSSL with cryptodev digest support until engine digest -# interface gets some rework: -CFLAG_class-target := "${@'${CFLAG}'.replace('-DUSE_CRYPTODEV_DIGESTS', '')}" -- 1.9.2 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
