In kernel v5.8-rc1, commit 228c4f265c6e ("crypto: lib/sha1 - fold
linux/cryptohash.h into crypto/sha.h"), cryptohash.h was moved and
renamed to sha.h.Signed-off-by: Yongxin Liu <[email protected]> --- ...-linux-cryptohash.h-with-crypto-sha.h-for.patch | 35 ++++++++++++++++++++++ recipes-extended/qat/qat17_4.7.0-00006.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 recipes-extended/qat/files/qat17_4.7.0-00006-qat-replace-linux-cryptohash.h-with-crypto-sha.h-for.patch diff --git a/recipes-extended/qat/files/qat17_4.7.0-00006-qat-replace-linux-cryptohash.h-with-crypto-sha.h-for.patch b/recipes-extended/qat/files/qat17_4.7.0-00006-qat-replace-linux-cryptohash.h-with-crypto-sha.h-for.patch new file mode 100644 index 0000000..27055ed --- /dev/null +++ b/recipes-extended/qat/files/qat17_4.7.0-00006-qat-replace-linux-cryptohash.h-with-crypto-sha.h-for.patch @@ -0,0 +1,35 @@ +From fcc9a80e47f1a9945987e398626074bddfc705c0 Mon Sep 17 00:00:00 2001 +From: Yongxin Liu <[email protected]> +Date: Fri, 24 Jul 2020 09:27:48 +0800 +Subject: [PATCH] qat: replace linux/cryptohash.h with crypto/sha.h for kernel + v5.8 + +This is to accommodate kernel commit 228c4f265c6e ("crypto: +lib/sha1 - fold linux/cryptohash.h into crypto/sha.h"). + +Upstream-Status: Inappropriate [Code released in tarball form only] + +Signed-off-by: Yongxin Liu <[email protected]> +--- + .../utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c +index 2d5b233..92ee35b 100644 +--- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c ++++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c +@@ -66,7 +66,11 @@ + + #include "Osal.h" + #include <linux/crypto.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) ++#include <crypto/sha.h> ++#else + #include <linux/cryptohash.h> ++#endif + #include <linux/version.h> + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + #include <crypto/internal/hash.h> +-- +2.14.4 + diff --git a/recipes-extended/qat/qat17_4.7.0-00006.bb b/recipes-extended/qat/qat17_4.7.0-00006.bb index 640525b..047c184 100644 --- a/recipes-extended/qat/qat17_4.7.0-00006.bb +++ b/recipes-extended/qat/qat17_4.7.0-00006.bb @@ -24,6 +24,7 @@ SRC_URI = "https://01.org/sites/default/files/downloads/qat1.7.l.4.7.0-00006.tar file://qat17_4.7.0-00006-Switch-to-skcipher-API.patch;apply=0 \ file://qat17_4.7.0-00006-make-it-compatible-with-kernel-5.6.patch;apply=0 \ file://qat17_4.7.0-00006-crypto-qat-adf_aer-Remove-pci_cleanup_aer_uncorrect_.patch \ + file://qat17_4.7.0-00006-qat-replace-linux-cryptohash.h-with-crypto-sha.h-for.patch \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -- 2.14.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6647): https://lists.yoctoproject.org/g/meta-intel/message/6647 Mute This Topic: https://lists.yoctoproject.org/mt/75759344/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
