]> code.ossystems Code Review - meta-freescale.git/commitdiff
openssl: Avoid contamination OE-Core recipe
authorOtavio Salvador <otavio@ossystems.com.br>
Wed, 29 Jul 2015 21:11:18 +0000 (18:11 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 19 Apr 2016 18:03:14 +0000 (15:03 -0300)
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: Otavio Salvador <otavio@ossystems.com.br>
32 files changed:
conf/machine/include/qoriq-arm.inc
conf/machine/include/qoriq-base.inc
recipes-connectivity/openssl/openssl-qoriq.inc [moved from recipes-connectivity/openssl/openssl.inc with 100% similarity]
recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb [new file with mode: 0644]
recipes-connectivity/openssl/openssl/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch [moved from recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch [moved from recipes-connectivity/openssl/openssl-fsl/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0003-cryptodev-fix-algorithm-registration.patch [moved from recipes-connectivity/openssl/openssl-fsl/0003-cryptodev-fix-algorithm-registration.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch [moved from recipes-connectivity/openssl/openssl-fsl/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch [moved from recipes-connectivity/openssl/openssl-fsl/0005-ECC-Support-header-for-Cryptodev-Engine.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0006-Fixed-private-key-support-for-DH.patch [moved from recipes-connectivity/openssl/openssl-fsl/0006-Fixed-private-key-support-for-DH.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0007-Fixed-private-key-support-for-DH.patch [moved from recipes-connectivity/openssl/openssl-fsl/0007-Fixed-private-key-support-for-DH.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch [moved from recipes-connectivity/openssl/openssl-fsl/0008-Initial-support-for-PKC-in-cryptodev-engine.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch [moved from recipes-connectivity/openssl/openssl-fsl/0009-Added-hwrng-dev-file-as-source-of-RNG.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch [moved from recipes-connectivity/openssl/openssl-fsl/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch [moved from recipes-connectivity/openssl/openssl-fsl/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0012-RSA-Keygen-Fix.patch [moved from recipes-connectivity/openssl/openssl-fsl/0012-RSA-Keygen-Fix.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0013-Removed-local-copy-of-curve_t-type.patch [moved from recipes-connectivity/openssl/openssl-fsl/0013-Removed-local-copy-of-curve_t-type.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch [moved from recipes-connectivity/openssl/openssl-fsl/0014-Modulus-parameter-is-not-populated-by-dhparams.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch [moved from recipes-connectivity/openssl/openssl-fsl/0015-SW-Backoff-mechanism-for-dsa-keygen.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0016-Fixed-DH-keygen-pair-generator.patch [moved from recipes-connectivity/openssl/openssl-fsl/0016-Fixed-DH-keygen-pair-generator.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch [moved from recipes-connectivity/openssl/openssl-fsl/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch [moved from recipes-connectivity/openssl/openssl-fsl/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch [moved from recipes-connectivity/openssl/openssl-fsl/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch [moved from recipes-connectivity/openssl/openssl-fsl/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0021-cryptodev-drop-redundant-function.patch [moved from recipes-connectivity/openssl/openssl-fsl/0021-cryptodev-drop-redundant-function.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch [moved from recipes-connectivity/openssl/openssl-fsl/0022-cryptodev-do-not-zero-the-buffer-before-use.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0023-cryptodev-clean-up-code-layout.patch [moved from recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch [moved from recipes-connectivity/openssl/openssl-fsl/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch [moved from recipes-connectivity/openssl/openssl-fsl/0025-cryptodev-put_dev_crypto-should-be-an-int.patch with 100% similarity]
recipes-connectivity/openssl/openssl/qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch [moved from recipes-connectivity/openssl/openssl-fsl/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch with 100% similarity]
recipes-connectivity/openssl/openssl_1.0.1i.bb [deleted file]
recipes-connectivity/openssl/openssl_1.0.1i.bbappend [deleted file]

index ba6345cf58384eaaa394fd6c934d328dbcbc0122..f93a0b21672a1b5582651e9fb414501e772e047c 100644 (file)
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1"
 PREFERRED_PROVIDER_cryptodev_ls102xa = "cryptodev-qoriq"
 PREFERRED_PROVIDER_cryptodev-module_ls102xa = "cryptodev-qoriq-module"
 PREFERRED_PROVIDER_cryptodev-tests_ls102xa = "cryptodev-qoriq-tests"
+PREFERRED_PROVIDER_openssl_ls102xa = "openssl-qoriq"
 
 # Define the default image type
 IMAGE_CLASSES ?= "image_types_uboot"
index e5949fa4c0b236448056c8ea81b875d346f11cd3..a89f4d5105b1cb466effbbdefed506e4d617d7a6 100644 (file)
@@ -7,10 +7,10 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq"
 PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
 PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
+PREFERRED_PROVIDER_openssl = "openssl-qoriq"
 
 # versions
 PREFERRED_VERSION_qemu = "2.2.0+fsl"
-PREFERRED_VERSION_openssl = "1.0.1i"
 
 # settings
 MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
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 (file)
index 0000000..b4d5cd4
--- /dev/null
@@ -0,0 +1,98 @@
+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}"
+
+PROVIDES = "openssl"
+
+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-arm|qoriq-ppc)"
diff --git a/recipes-connectivity/openssl/openssl_1.0.1i.bb b/recipes-connectivity/openssl/openssl_1.0.1i.bb
deleted file mode 100644 (file)
index 9d093ef..0000000
+++ /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 (file)
index 7b381ff..0000000
+++ /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', '')}"