Add qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch
to fix QAT static library building issue with v5.10-rc1 or later, due to
kernel commit 6212804f2d78 ("kbuild: do not create built-in objects for
external module builds").Signed-off-by: Yongxin Liu <[email protected]> --- ...write-KBUILD_BUILTIN-in-kernel-s-Makefile.patch | 33 ++++++++++++++++++++++ recipes-extended/qat/qat17_4.7.0-00006.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 recipes-extended/qat/files/qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch diff --git a/recipes-extended/qat/files/qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch b/recipes-extended/qat/files/qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch new file mode 100644 index 0000000..6af5a6a --- /dev/null +++ b/recipes-extended/qat/files/qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch @@ -0,0 +1,33 @@ +From bf4053e4685bbbf84e6f91d18809dbf4487d03d9 Mon Sep 17 00:00:00 2001 +From: Yongxin Liu <[email protected]> +Date: Wed, 25 Nov 2020 07:58:07 +0800 +Subject: [PATCH] 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 a692b37..302ae19 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.4 + diff --git a/recipes-extended/qat/qat17_4.7.0-00006.bb b/recipes-extended/qat/qat17_4.7.0-00006.bb index b6143ae..af292cf 100644 --- a/recipes-extended/qat/qat17_4.7.0-00006.bb +++ b/recipes-extended/qat/qat17_4.7.0-00006.bb @@ -25,6 +25,7 @@ SRC_URI = "https://01.org/sites/default/files/downloads/qat1.7.l.4.7.0-00006.tar 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 \ + file://qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -- 2.14.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6829): https://lists.yoctoproject.org/g/meta-intel/message/6829 Mute This Topic: https://lists.yoctoproject.org/mt/78495137/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
