On 08/03/2016 02:59 AM, Rahul Kumar Gupta wrote: > Dear Maintainer(s), > > These patches will fix the unpack and patch error causes due to incremental > builds of zlib-qat v0.4.7-002 and openssl-qat v0.4.9-009. These packages > needs a patch present in a zip file that is unpacked and applied on top of > zlib and openssl respectively. > > So the work around is to split do_patch into two - one to unpack the qat patch > and apply it on openssl and zlib respectively. And, other to apply the patches > added in SRC_URI. > > The image have been tested on Grantley-Broadwell using intel-corei7-64 BSP. >
Getting build errors: Build Configuration: BB_VERSION = "1.31.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "intel-corei7-64" DISTRO = "poky" DISTRO_VERSION = "2.1+snapshot-20160804" TUNE_FEATURES = "m64 corei7" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "master9:a56fb90dc3805494eeaf04c60538425e8d52efc5" meta-intel meta-isg = "master13:3fdd6fdae1df3223d4d748dbcf609c27a79b8f9d" Initialising tasks: 100% |######################################################################| Time: 0:00:02 NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: openssl-qat-0.4.9-009-r0 do_patch: Function failed: opensslqat_do_patch (log file is located at /usr/local/dev/yocto/master-cur/build/tmp/work/intel_corei7_64-poky-linux/openssl-qat/0.4.9-009-r0/temp/log.do_patch.25068) ERROR: Logfile of failure stored in: /usr/local/dev/yocto/master-cur/build/tmp/work/intel_corei7_64-poky-linux/openssl-qat/0.4.9-009-r0/temp/log.do_patch.25068 Log data follows: | DEBUG: Executing python function do_patch | DEBUG: Executing shell function opensslqat_do_patch | No patch removed | Applying patch /usr/local/dev/yocto/master-cur/build/tmp/work/intel_corei7_64-poky-linux/openssl-qat/0.4.9-009-r0/git/debian/patches/openssl-1.0.1async-qat.patch | patching file Configure | Hunk #1 FAILED at 716. | Hunk #2 succeeded at 1150 with fuzz 2 (offset -223 lines). | Hunk #3 FAILED at 1617. | Hunk #4 FAILED at 1632. | 3 out of 4 hunks FAILED -- rejects in file Configure | patching file apps/Makefile | Hunk #1 FAILED at 32. | 1 out of 1 hunk FAILED -- rejects in file apps/Makefile | patching file apps/openssl.c | Hunk #1 FAILED at 134. | Hunk #2 FAILED at 280. | 2 out of 2 hunks FAILED -- rejects in file apps/openssl.c | patching file apps/s_server.c | Hunk #1 FAILED at 196. | Hunk #2 FAILED at 612. | Hunk #3 FAILED at 1015. | Hunk #4 FAILED at 1380. | Hunk #5 FAILED at 1419. | 5 out of 5 hunks FAILED -- rejects in file apps/s_server.c | patching file apps/speed.c | Hunk #1 FAILED at 110. | Hunk #2 FAILED at 364. | Hunk #3 FAILED at 533. | Hunk #4 FAILED at 854. | Hunk #5 FAILED at 1000. | Hunk #6 succeeded at 1071 with fuzz 1 (offset 54 lines). | Hunk #7 FAILED at 1476. | Hunk #8 succeeded at 1563 with fuzz 2 (offset 75 lines). | Hunk #9 succeeded at 1581 with fuzz 2 (offset 79 lines). | Hunk #10 FAILED at 1514. | Hunk #11 FAILED at 1525. | Hunk #12 FAILED at 2290. | Hunk #13 FAILED at 2303. | Hunk #14 FAILED at 2338. | Hunk #15 FAILED at 2350. | Hunk #16 FAILED at 2371. | Hunk #17 FAILED at 2397. | Hunk #18 FAILED at 2404. | Hunk #19 FAILED at 2464. | Hunk #20 FAILED at 2492. | 17 out of 20 hunks FAILED -- rejects in file apps/speed.c | patching file crypto/engine/eng_all.c | Hunk #1 succeeded at 115 with fuzz 2 (offset 3 lines). | Hunk #2 succeeded at 132 with fuzz 2 (offset 6 lines). | patching file crypto/engine/engine.h | Hunk #1 FAILED at 405. | 1 out of 1 hunk FAILED -- rejects in file crypto/engine/engine.h | patching file crypto/opensslv.h | Hunk #1 FAILED at 31. | 1 out of 1 hunk FAILED -- rejects in file crypto/opensslv.h | patching file engines/Makefile | Hunk #1 FAILED at 10. | Hunk #2 FAILED at 139. | 2 out of 2 hunks FAILED -- rejects in file engines/Makefile | The next patch would create the file engines/qat_engine/Makefile, | which already exists! Applying it anyway. | patching file engines/qat_engine/Makefile | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/Makefile | The next patch would create the file engines/qat_engine/e_qat.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/e_qat.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/e_qat.c | The next patch would create the file engines/qat_engine/e_qat.ec, | which already exists! Applying it anyway. | patching file engines/qat_engine/e_qat.ec | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/e_qat.ec | The next patch would create the file engines/qat_engine/e_qat.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/e_qat.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/e_qat.h | The next patch would create the file engines/qat_engine/qae_mem_utils.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qae_mem_utils.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qae_mem_utils.c | The next patch would create the file engines/qat_engine/qae_mem_utils.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qae_mem_utils.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qae_mem_utils.h | The next patch would create the file engines/qat_engine/qat_asym_common.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_asym_common.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_asym_common.c | The next patch would create the file engines/qat_engine/qat_asym_common.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_asym_common.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_asym_common.h | The next patch would create the file engines/qat_engine/qat_chain.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_chain.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_chain.c | The next patch would create the file engines/qat_engine/qat_chain.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_chain.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_chain.h | The next patch would create the file engines/qat_engine/qat_ciphers.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_ciphers.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_ciphers.c | The next patch would create the file engines/qat_engine/qat_ciphers.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_ciphers.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_ciphers.h | The next patch would create the file engines/qat_engine/qat_dh.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_dh.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_dh.c | The next patch would create the file engines/qat_engine/qat_dh.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_dh.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_dh.h | The next patch would create the file engines/qat_engine/qat_digests.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_digests.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_digests.c | The next patch would create the file engines/qat_engine/qat_digests.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_digests.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_digests.h | The next patch would create the file engines/qat_engine/qat_dsa.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_dsa.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_dsa.c | The next patch would create the file engines/qat_engine/qat_dsa.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_dsa.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_dsa.h | The next patch would create the file engines/qat_engine/qat_ecdh.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_ecdh.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_ecdh.c | The next patch would create the file engines/qat_engine/qat_ecdh.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_ecdh.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_ecdh.h | The next patch would create the file engines/qat_engine/qat_ecdsa.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_ecdsa.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_ecdsa.c | The next patch would create the file engines/qat_engine/qat_ecdsa.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_ecdsa.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_ecdsa.h | The next patch would create the file engines/qat_engine/qat_mem/LICENSE.GPL, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem/LICENSE.GPL | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem/LICENSE.GPL | The next patch would create the file engines/qat_engine/qat_mem/Makefile, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem/Makefile | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem/Makefile | The next patch would create the file engines/qat_engine/qat_mem/qat_mem.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem/qat_mem.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem/qat_mem.c | The next patch would create the file engines/qat_engine/qat_mem/qat_mem.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem/qat_mem.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem/qat_mem.h | The next patch would create the file engines/qat_engine/qat_mem/qat_mem_test.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem/qat_mem_test.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem/qat_mem_test.c | The next patch would create the file engines/qat_engine/qat_mem_drv_inf.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem_drv_inf.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem_drv_inf.c | The next patch would create the file engines/qat_engine/qat_mem_drv_inf.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_mem_drv_inf.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_mem_drv_inf.h | The next patch would create the file engines/qat_engine/qat_parseconf.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_parseconf.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_parseconf.c | The next patch would create the file engines/qat_engine/qat_parseconf.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_parseconf.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_parseconf.h | The next patch would create the file engines/qat_engine/qat_prf.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_prf.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_prf.c | The next patch would create the file engines/qat_engine/qat_prf.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_prf.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_prf.h | The next patch would create the file engines/qat_engine/qat_rand.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_rand.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_rand.c | The next patch would create the file engines/qat_engine/qat_rand.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_rand.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_rand.h | The next patch would create the file engines/qat_engine/qat_rsa.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_rsa.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_rsa.c | The next patch would create the file engines/qat_engine/qat_rsa.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_rsa.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_rsa.h | The next patch would create the file engines/qat_engine/qat_sym_common.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_sym_common.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_sym_common.c | The next patch would create the file engines/qat_engine/qat_sym_common.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_sym_common.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_sym_common.h | The next patch would create the file engines/qat_engine/qat_utils.c, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_utils.c | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_utils.c | The next patch would create the file engines/qat_engine/qat_utils.h, | which already exists! Applying it anyway. | patching file engines/qat_engine/qat_utils.h | Hunk #1 FAILED at 1. | 1 out of 1 hunk FAILED -- rejects in file engines/qat_engine/qat_utils.h | patching file ssl/s3_pkt.c | Hunk #1 FAILED at 147. | Hunk #2 FAILED at 1147. | 2 out of 2 hunks FAILED -- rejects in file ssl/s3_pkt.c | patching file ssl/ssl3.h | Hunk #1 FAILED at 273. | 1 out of 1 hunk FAILED -- rejects in file ssl/ssl3.h | patching file test/Makefile | Hunk #1 FAILED at 30. | 1 out of 1 hunk FAILED -- rejects in file test/Makefile | Patch /usr/local/dev/yocto/master-cur/build/tmp/work/intel_corei7_64-poky-linux/openssl-qat/0.4.9-009-r0/git/debian/patches/openssl-1.0.1async-qat.patch can be reverse-applied | WARNING: exit code 1 from a shell command. | DEBUG: Python function do_patch finished | ERROR: Function failed: opensslqat_do_patch (log file is located at /usr/local/dev/yocto/master-cur/build/tmp/work/intel_corei7_64-poky-linux/openssl-qat/0.4.9-009-r0/temp/log.do_patch.25068) ERROR: Task /usr/local/dev/yocto/master-cur/meta-intel/meta-isg/common/recipes-extended/openssl-qat/openssl-qat_0.4.9-009.bb:do_patch (/usr/local/dev/yocto/master-cur/meta-intel/meta-isg/common/recipes-extended/openssl-qat/openssl-qat_0.4.9-009.bb:do_patch) failed with exit code '1' > Please merge in master if these looks ok. > > Thanks > > Rahul Kumar Gupta (2): > meta-isg: zlib-qat: fix for unpack and patch error > meta-isg: openssl-qat: fix for patch error > > .../recipes-extended/openssl-qat/openssl-qat.inc | 37 +++++++++++++------- > .../zlib-qat/zlib-qat_0.4.7-002.bb | 40 > ++++++++++++++-------- > 2 files changed, 51 insertions(+), 26 deletions(-) > -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
