From patchwork Mon Sep 19 18:22:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Monsees, Steven C (US)" X-Patchwork-Id: 12999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3BD5ECAAA1 for ; Mon, 19 Sep 2022 18:23:22 +0000 (UTC) Received: from dmzms99801.na.baesystems.com (dmzms99801.na.baesystems.com [149.32.232.65]) by mx.groups.io with SMTP id smtpd.web08.2529.1663611797786177105 for ; Mon, 19 Sep 2022 11:23:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@baesystems.com header.s=trusted01 header.b=BSaCftWz; spf=pass (domain: baesystems.com, ip: 149.32.232.65, mailfrom: steven.monsees@baesystems.com) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=baesystems.com; i=@baesystems.com; q=dns/txt; s=trusted01; t=1663611797; x=1821291797; h=from:to:subject:date:mime-version; bh=Ol+2a++Q5bWeaMYT+ojnpFvI3WwOF7G6PI1TcDH1jgs=; b=BSaCftWzskddgtv/cea5dZMUCP8R+rN+9AE2i/GmkhWa7mpHnkJjPk0f WbfS53Na7UVj7F9rbGKvVcgNZTWBpurxABcfy/quyKkIU1ojB1K+VQpMS 995/3g4AM+gTSYDlVNQ8fJCLVyXpVlK+Gkozyph0XyF9pjt21fwLBlq+T 8=; X-IPAS-Result: A2AmAACTsihj/wFUSQpaHAEBAQEBAQcBARIBAQQEAQFACYEyBwEBCwGBIIICAoFvjFaGE4JinROBfAsBAQEBAQEBAQEIAUIEAQGJciY0CQ4BAgQBAQEBAwIDAQEBAQEBAwEBBgEBAQEBAQYEAYEbhS86DII1IoQfXgEVayYBBBuCdoIWgQqsJIEzGgJlhHCFEoE9AYFlhl+DIxKGN0OECIt1BJh2BzcDRR1BAwsOaAMVAxQDBSQHAxkPIw0NBB0MAwMFJQMCAhsHAgIDAgYTBQICTTgIBAgEKyQPBQIHLwUELwIeBAUGEQgCFgIGBAQEBBUCEAgCCCYXBxMzGQEFWRAJIRwoDQUGEwMgbwVFDygyaysdGwqBDCooFQMEBAMCBhMDAyICECoxFAQpExItBytzCQIDImwDAwQoLAMJIQIBHAcoJjwHWD8DAxAiPQYDCQMCJFqBMCgFAw0ZJggFOR0ECDwCBQYlmkN8CQpMgWgkSwOSFI4AhAudKgcDg1agIS4WlxEDhVOMHYc9j00gokGEWwIEAgQFAhaBYYIVcIM4UBcCnH+BMAIGCwEBAwmJZIESAQE IronPort-PHdr: A9a23:Mf7btRdEddDcehLXOxfqrUoAlGM+Jt7LVj580XLHo4xHfqnrxZn+J kuXvawr0AWSG96BtLkd0baempujcFRI2YyGvnEGfc4EfD4+ouJSoTYdBtWYA1bwNv/gYn9yN s1DUFh44yPzahANS47xaFLIv3K98yMZFAnhOgppPOT1HZPZg9iq2+yo9JDffQtFiCCzbL9sL hi6ohjdutcZjIB/Nqs/1xzFr2dSde9L321oP1WTnxj95se04pFu9jlbtuwi+cBdT6j0Zrw0Q rNEAjsoNWA1/9DrugLYTQST/HscU34ZnQRODgPY8Rz1RJbxsi/9tupgxCmXOND9QL4oVTi+6 apgVRnlgzoFOTEk6mHaksx+grxGrhK9qRJxwI/Ub52aO/dlZKzRYdEaSHBdUspNSSBMBJ63Y YsVD+oGOOZVt4fxqVwJrRu4HgmjGv3gyiRQinTrwKM6z/ouER/Y0wwmAtkDrmnfoNH7O6kPV Oy5wrTDwDLYb/NKxzj99pbHchY7rfGJWrJwd9HRxlcxGAPelVifspbqMC2O1uUNqGib8/RvV ee0i2I9tw5xpT2vy94qh4LUiY0b1krK+j9lwIYpO9K4Ukh7bMaqHpZeqyyXNol7T8I8T211p is3yb0LtJq0cSUF1ZgpyR7SZfOaf4WM4B/uVOmcLDZliH97fL+yhBW//FW9xuPzUMS/zVVEr jJdn9XRqnwBzR7e58adRvZ+8UqtwyuD2xjO5u1YO0w5mqXWJ4Quz7IqmJcetULOFTLslkrsl q+ZbEAk9/Ct6+Tgf7rpuIeRN5RxigHiKqQundG/AfggPggOQWeb/eO82aX//Uz2WrpKiPg2k rLdvZzGOcgXurO1DxVI0oY48RqwFC2p38oDnXgHN1JFZAyIj43yO13UPP/4CvK/j0ytkDdt2 f/GIqXsDojRInTZkrrsc6xx5k1TxQYp0NxT/5dUBasAIPL3VE/xrtvYDhohPgyv3+boFst92 Z0YWW6VB6+ZN6XSsUSW6e0xOOmBf5QatyzjJPg+5//ulmM5lkEYfamyx5cYdHe4HvF+L0Wfe nXjms0BHnsSvgoiUOzqj0WPXSNLa3aoQ608/i07CJ6hDYrbRoGth6CO3Du8HpBNYmBGC0uME Wvzd4meW/YMbz6dItNmkjwcT7ihTI0h2g+yuw/m0bZnKfDU+iJL/a7kgZJk4ObPkjk29CdoF IKM1GqRSHlumWEFTCNw27pw6wQp21CIza9Qh/1DCccV9vRCTgAiL5newudmTdfoVVSSUM2OT QPsZ9KgGjw8VZZ5+MMDfUt7U/7qzi34nmDiV6QJmqKGAtox9aTH0nXqD8x0xm3Xz7UsikJgS cxKYz71zpVj/hTeUtaa236SkLynIPx04Q== IronPort-Data: A9a23:LWcTWqrbLpsBllUbJ38bl6Dku9NeBmKQZxIvgKrLsJaIsI4StFCzt garIBmBb6zfNmKgfNlxPNji80pQupTSydFmHQJlr3gxRSJBpePIVI+TRqvS04N+DSFhoGZPt Zh2hgzodZhsJpPkjk7xdOCn9BGQ7InQLlbGILes1htZGEk1E0/NtTo5w7Rj2t8x0IDja++wk YqaT/P3aQfNNwFcbzp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFontR5fMebS4K8bhL wr1IBBVyUuCl/slIovNfr8W6STmSJaKVeSFoiI+t6RPHnGuqwRqupvXOsbwZm9I1zeFkdROz uxpnoKVbVouAI3SgN4SBkww/yFWZcWq+ZfbMXG5tNfClxWeKj3x2LNkBUwtLJYE9+NsR2pJ8 JT0KhhUNlbc3KTmnPTiIgVvrp1LwM3DJ58SpHxmizTeC+0rTIvrSazH/s5DwDo1nYZFGvO2i 88xM2M3NU+cOE0n1lE/GoMztbyh2ULFXRpCplXSuKws4EPvw1kkuFTqGJ+PEjCQfu1EmU2Eo UrC/n/lGVcLM9eDziKf9XChjfOJmjn0ML/+D5Xhrrg12xvDmipKYPELaWaGTTCCohbWc7pix 4Y8o0LCcYBaGJSXc+TA IronPort-HdrOrdr: A9a23:/QYyxqB1Ldrd4rDlHel055DYdb4zR+YMi2TDtnoQdfUxSKelfq +V9sjzuSWYtN9pYgBapTniAsi9qBHnmqKdiLN5VYtKNzOJhILHFu1fBQuL+UyCJ8WpnNQtrZ uJ8MBFeaTN5d8Tt7ef3OE7e+xQpuVucciT9IXjJ/IEd3AOV0lKhT0JcDpyPidNNW57OaY= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="5.93,328,1654560000"; d="scan'208,217";a="21013438" X-IronPort-AV: E=Sophos;i="5.93,328,1654560000"; d="scan'208,217";a="141677916" From: "Monsees, Steven C (US)" To: "yocto@lists.yoctoproject.org" Subject: #yocto #dunfell Thread-Topic: #yocto #dunfell Thread-Index: AdjMU0UdZcuA5K7pTkmpIRZHVGqZIg== Date: Mon, 19 Sep 2022 18:22:15 +0000 Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.44.4.39] MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 19 Sep 2022 18:23:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58081 Message-Id: <20220919182322.A3BD5ECAAA1@smtp.lore.kernel.org> I am seeing an error when I attempt to apply a patch, and could use some clarification or way to resolve... Am doing something wrong in patch creation ? What is meant by : "Patch console.patch does not apply (enforce with -f)" ? How can I best resolve this issue ? I edited a file in the recipe's git repo in order to create the patch for the change: git diff -u console.c which I used as my patch: I am getting the following error when the patch is applied: ERROR: efitools-native-1.7.0+gitAUTOINC+0649468475-r0 do_patch: Applying patch 'console.patch' on target directory '/disk0/scratch/yocto/workspace/poky-dunfell-23.0.19/builds/sbca-default/tmp/work/x86_64-linux/efitools-native/1.7.0+gitAUTOINC+0649468475-r0/git' Command Error: 'quilt --quiltrc /disk0/scratch/yocto/workspace/poky-dunfell-23.0.19/builds/sbca-default/tmp/work/x86_64-linux/efitools-native/1.7.0+gitAUTOINC+0649468475-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch console.patch patching file lib/console.c Hunk #1 FAILED at 357. 1 out of 1 hunk FAILED -- rejects in file lib/console.c Patch console.patch does not apply (enforce with -f) ERROR: Logfile of failure stored in: /disk0/scratch/yocto/workspace/poky-dunfell-23.0.19/builds/sbca-default/tmp/work/x86_64-linux/efitools-native/1.7.0+gitAUTOINC+0649468475-r0/temp/log.do_patch.7615 ERROR: Task (/disk0/scratch/yocto/workspace/poky-dunfell-23.0.19/meta-bae/meta-limws/meta-intel/meta-sbca/recipes-bsp/efitools/efitools-native_git.bb:do_patch) failed with exit code '1' Thanks, Steve diff --git a/lib/console.c b/lib/console.c index 9c10560..b932a44 100644 --- a/lib/console.c +++ b/lib/console.c @@ -357,7 +357,7 @@ static struct { { EFI_SECURITY_VIOLATION, L"Security Violation"}, // warnings - { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, + { EFI_WARN_UNKNOWN_GLYPH, L"Warning Unknown Glyph"}, { EFI_WARN_DELETE_FAILURE, L"Warning Delete Failure"}, { EFI_WARN_WRITE_FAILURE, L"Warning Write Failure"}, { EFI_WARN_BUFFER_TOO_SMALL, L"Warning Buffer Too Small"},