From: Chee Yang Lee <[email protected]> Signed-off-by: Chee Yang Lee <[email protected]> --- ...-KBUILD_BUILTIN-in-kernel-s-Makefile.patch | 33 ------------ ....h-and-sha2.h-instead-of-sha.h-in-ke.patch | 54 ------------------- 2 files changed, 87 deletions(-) delete mode 100644 recipes-extended/qat/files/0008-qat-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch delete mode 100644 recipes-extended/qat/files/0010-qat-include-sha1.h-and-sha2.h-instead-of-sha.h-in-ke.patch
diff --git a/recipes-extended/qat/files/0008-qat-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch b/recipes-extended/qat/files/0008-qat-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch deleted file mode 100644 index b511473..0000000 --- a/recipes-extended/qat/files/0008-qat-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 315838f92b83da62afd2800b57eddd03d0cfde58 Mon Sep 17 00:00:00 2001 -From: Yongxin Liu <[email protected]> -Date: Wed, 25 Nov 2020 07:58:07 +0800 -Subject: [PATCH 08/11] qat: overwrite KBUILD_BUILTIN in kernel's Makefile - -Since kernel v5.10-rc1, commit 6212804f2d78 ("kbuild: do not create -built-in objects for external module builds"), QAT static libraries -cannot be created. So add KBUILD_BUILTIN=1 in command line to overwrite -it in kernel Makefile. - -Upstream-Status: Inappropriate [Code released in tarball form only] - -Signed-off-by: Yongxin Liu <[email protected]> ---- - quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk b/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk -index 71bbeb7..8a5cfbc 100644 ---- a/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk -+++ b/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk -@@ -72,7 +72,7 @@ endif - - $(LIB_STATIC): dirs - @echo 'Creating static library ${LIB_STATIC}'; \ -- $(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD) obj-m=""; \ -+ $(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD) obj-m="" KBUILD_BUILTIN=1; \ - echo 'Copying outputs';\ - test -f lib.a && (ar -t lib.a | xargs ar -rcsD $(LIB_STATIC)); \ - test -f $(LIB_STATIC) && mv -f $(LIB_STATIC) $($(PROG_ACY)_FINAL_OUTPUT_DIR)/$(LIB_STATIC); \ --- -2.14.5 - diff --git a/recipes-extended/qat/files/0010-qat-include-sha1.h-and-sha2.h-instead-of-sha.h-in-ke.patch b/recipes-extended/qat/files/0010-qat-include-sha1.h-and-sha2.h-instead-of-sha.h-in-ke.patch deleted file mode 100644 index b86d1db..0000000 --- a/recipes-extended/qat/files/0010-qat-include-sha1.h-and-sha2.h-instead-of-sha.h-in-ke.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c9e04ec8d8be3a1f21a5bdc6c5c79f50191d57dd Mon Sep 17 00:00:00 2001 -From: Yongxin Liu <[email protected]> -Date: Thu, 28 Jan 2021 13:07:59 +0800 -Subject: [PATCH 10/11] qat: include sha1.h and sha2.h instead of sha.h in - kernel v5.11 - -In kernel commit a24d22b225ce ("crypto: sha - split sha.h into sha1.h and sha2.h"), -<crypto/sha.h> was split into two headers <crypto/sha1.h> and <crypto/sha2.h>. - -Upstream-Status: Inappropriate [Code released in tarball form only] - -Signed-off-by: Yongxin Liu <[email protected]> ---- - quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c | 5 +++++ - .../utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c -index 37ac11e..08680ca 100644 ---- a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c -+++ b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c -@@ -52,7 +52,12 @@ - #include <crypto/internal/aead.h> - #include <crypto/internal/skcipher.h> - #include <crypto/aes.h> -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) -+#include <crypto/sha1.h> -+#include <crypto/sha2.h> -+#else - #include <crypto/sha.h> -+#endif - #include <crypto/hash.h> - #include <crypto/algapi.h> - #include <crypto/authenc.h> -diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -index 9d2e85c..de24fa0 100644 ---- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -@@ -69,7 +69,12 @@ - #include <linux/version.h> - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - #include <crypto/internal/hash.h> -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) -+#include <crypto/sha1.h> -+#include <crypto/sha2.h> -+#else - #include <crypto/sha.h> -+#endif - - #define OSAL_MAX_SHASH_DECSIZE 512 - --- -2.14.5 - -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7757): https://lists.yoctoproject.org/g/meta-intel/message/7757 Mute This Topic: https://lists.yoctoproject.org/mt/95085449/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
