From mboxrd@z Thu Jan 1 00:00:00 1970 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 D1706C54EE9 for ; Tue, 20 Sep 2022 15:46:48 +0000 (UTC) Received: from dmzms99801.na.baesystems.com (dmzms99801.na.baesystems.com [149.32.232.65]) by mx.groups.io with SMTP id smtpd.web12.13810.1663688799104574963 for ; Tue, 20 Sep 2022 08:46:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@baesystems.com header.s=trusted01 header.b=SkIbGvsx; 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=1663688799; x=1821368799; h=from:to:subject:date:in-reply-to:mime-version; bh=ytR3Kau5wsYJCkhYkp+9FSRI2YZdVDWd8n4O+bdkq74=; b=SkIbGvsxNY3a/6xqE02goSUB8LxwaNi7QzVv/6YZFaMLVYNFg0XAYf0T BtOy0grmIN/ySWm9l4vU+eAT1WkwXAlQkE4O5q9XGtiCRTDju5jliyk9V z/WtshYV6vGip7F9sBs5xEap26YE5L0Hgxgs7SYXRrxy2MK4CTo9P3LVb A=; X-IPAS-Result: =?us-ascii?q?A2AGAABe3ylj/0HBJQpaGgEBAQEBAQEBAQEDAQEBARIBA?= =?us-ascii?q?QEBAgIBAQEBQAmBMwQBAQEBCwGBIIICAg6BSheSaYJiA4EThQGKUowqFIFoC?= =?us-ascii?q?wEBAQEBAQEBAQgBLAEGDwQBAYUFAoRrJjUIDgECBAEBAQEDAgMBAQEBAQEDA?= =?us-ascii?q?QEGAQEBAQEBBgQBgRuFLzkNgjUpAYNjAQEBAQMBLFwCAQgNBAMBAQEWCwcHK?= =?us-ascii?q?AoUCQgBAQQBEggSAYJeBYIWgQqrHDV4gTQaAmWEcIUSgT0BgWWGYoMjhDyCD?= =?us-ascii?q?UOBFYJzNz6CYgQBgRYICgESAS8SDAoCB4V9BINolRAHNwNEHUEDCw5oAxUDF?= =?us-ascii?q?AMFJAcDGQ8jDQ0EFgcMAwMFJQMCAhsHAgIDAgYTBQICFzY4CAQIBCskDwUCB?= =?us-ascii?q?y8FBC8CHgQFBhEIAhYCBgQEBAQVAhAIAggmFwcTMxkBBVkQCSEWBg4aDQUGE?= =?us-ascii?q?wMgSSYFRQ8oMmsrHRsKgQwqCR8VAwQEAwIGEwMDIgIQKjEUBCkTEi0HK3MJA?= =?us-ascii?q?gMiZwUDAwQoLAMJIQIBHAcoJjwHWBIpBAMDECI9BgMJAwIkW4EELCgFAw0ZJ?= =?us-ascii?q?ggFIxYeBAg8AgUGJZgzgToUQ3wJCgEbMDBBdyRLA5IUQo0+hAudKgcDg1aLN?= =?us-ascii?q?40Dh2cuFoN2gVCLAIZLA4VThi6Fb4c9j00goV0NCDcYhFsCBAIEBQIWgWIBR?= =?us-ascii?q?x4+cHCDNwlIFwKXNYVKdQIBOAIGCwEBAwmJaIESAQE?= IronPort-PHdr: A9a23:+K53hBX/JTyunUdO1/azuU4bLUjV8KzgUjF92vMcY1JmTK2v8tzYM VDF4r011RmVB96dsKgVwLuM+4nbGkU4qa6bt34DdJEeHzQksu4x2zIaPcieFEfgJ+TrZSFpV O5LVVti4m3peRMNQJW2aFLduGC94iAPERvjKwV1Ov71GonPhMiryuy+4ZLebxtGiTanb75+M hG7oQrVu8UInIBvNrs/xhzVr3VSZu9Y33loJVWdnxb94se/4ptu+DlOtvwi6sBNT7z0c7w3Q rJEAjsmNXs15NDwuhnYUQSP/HocXX4InRdOHgPI8Qv1Xpb1siv9q+p9xCyXNtD4QLwoRTiv6 bpgRQT2gykbKTE27GDXitRxjK1FphKhuwd/yJPQbI2MKfZyYr/RcdYcSGFcXMheSjZBD5u8Y YUREuQBIehWoYrzp1QMrBuxGQajCfj1xTNUhH/7x7E23/g/HQzAwQcuH8gOsHPRrNjtOqscV ue1zK/TzTrdcfxWwi/x45XVfBA9v/6MQ6x/cczMwkQxCgjJilufp5HgMz+by+8AtHOb7/Z+W uKxlWEnrRt9oj2oxscqkYnGmJwaykvf+Cpi2ok6O8a4SU5gYd64DpRQsjqaO5FqTcMlRmFlo SA3waAJtpCnZiYF0ognxwLBZPyddYiF+hzuWPueLDp2hHxreL2yiRms/UWj1uDxUtS53VdUo iZbnNfCuXAD2wDd5MWHSvZx4Ees1ziB2QzP5O9KL1w4mKrdJpU8zLAwkZ8Tvl7CHi/wgEj3j KiWeVk4+uiv8+TneLLmpp2COIBolgHyKKMumtawAek+LwMAXHCb9Pyh2LH/50H0TrdHgucrn qTdvp3WP8UWq66hDwNIzoov8RmyAji83NkXh3UKIlZIdRSahIbzIV7OOur3DfKnjlSplzdk2 u7JM6X6ApXIMnjDiLDhfath60JEyAo809Rf55VMB7EfOv3zWknxtNnDDhI9NwG5x/rrBMhn2 oMYQ22DGLSWP7nMvl+T5uMvOPWMa5EQuDbmMfQq+/nujXohlV8ce6mmw4cXZWilEvh6OUmUb 3jhjs0cHWoOsAcyVu3nhV2aXT5WfXmyXqY85j8hCIKhCIfOXputgKCf0yelAJJWYHpKClWLE XfubIWLRekDaDmJL8B6iDMLS6OhSo861RGyqgD6zqFnIvDI9S0fsJLvzN516PbLmhEo6TN0F 9id032KT2xsg28EXyU207xnoUxh1leD1rB1gvxfFdNP+/NJVRw3NZrdz+xhF9DyQRjNf9eOS Fm6XtWmBikxTsg2w98MfUlyB8miggrE3yqwDL9G34CMUaYz6bmU9WXrO8F7gyL807I6yXM7W NdIM0WvnKs5/A/WUcqB2VSenLqtXaAdxzLWsnaExnaJpFtfUgN7TePCR39VLh/Hqt/l4WvGT qSyEvI2NQBdztaYLalHYcGvik9JEqTNItPbNiiUnGGrCBuTgvu3cIf0dmNV922dNXNF2UhH5 mqLKwU4QCKmpXnTASdGH1vieFL37eR7szWwSUpinFLCVFFoy7fgok1dvvebUf5Gm+tc4E8c IronPort-Data: A9a23:WZqECa6FWlJLvEol9QnsTgxRtKzFchMFZxGqfqrLsTDasY5as4F+v mBLW2+EO/7Ya2KhetF1bovkpE0CvMfRzoRlHAtkpHw2Zn8b8sCt6fZ1jqvT04F+CuWZESqLO u1HMoGowPgcFyOa/lH0WlTYhSEUOZugH9IQM8aZfHEqLeNYYH1500g7yrRh2tcAbeWRWmthh /uj+6UzB3f4g1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJM53yZWKEpfNatI88thW5 gr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkSvqkAqm8A87ko0HMoGMGB1khG4ptky4 /5iiZKoYhciOrKZzYzxUzEAe81/FbNP+LnCOinu4JTKiUvPNXHlzu5/F107OJZe8eFyaY1M3 aVAbmtSKEnS3KTondpXScE17ignBNL3MZ0SvDdlyjfCAPs9aZrKTr7b/sNV2Sx2jcdLdRrbT 5BAM2U2NEyZC/FJEnBGEpMUwP2kvWPAXWVfgQ+f+po22XeGmWSd15CoarI5YOeiVMJegkGwo mPd43+/ExYRKNuH0z2H/3mwwOjVkkvGtJk6TeX+raEs2QzIgDJOYPELaWaGTTCCohbWc7pix 4Y8o0LCcYBaGJSXc+TA IronPort-HdrOrdr: A9a23:+J2YN6imWYnCig6DMI5mY/r8cXBQXtQji2hC6mlwRA09TyX4rb HWoB1/73SYtN9/YgBGpTn+AtjkfZqxz/JICOoqTNGftXfdyQ+VxehZhOOJrQEIcBeQygcy78 Zdm+kVMqyTMbGMt6aKgzWFLw== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="5.93,330,1654560000"; d="scan'208,217";a="21271001" X-IronPort-AV: E=Sophos;i="5.93,330,1654560000"; d="scan'208,217";a="94641187" From: "Monsees, Steven C (US)" To: Ross Burton , "yocto@lists.yoctoproject.org" Subject: RE: [yocto] #yocto #dunfell Thread-Topic: [yocto] #yocto #dunfell Thread-Index: AdjMU0UdZcuA5K7pTkmpIRZHVGqZIgArrwPQAAEkRHsAAFq/MA== Date: Tue, 20 Sep 2022 15:45:36 +0000 In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.44.4.39] Content-Type: multipart/alternative; boundary="_000_fd2847932aac4912823c8363777bc740baesystemscom_" 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 ; Tue, 20 Sep 2022 15:46:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58097 Message-Id: <20220920154648.D1706C54EE9@smtp.lore.kernel.org> --_000_fd2847932aac4912823c8363777bc740baesystemscom_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks... will give it a try. From: Ross Burton Sent: Tuesday, September 20, 2022 11:38 AM To: Monsees, Steven C (US) ; yocto@lists.yoc= toproject.org Subject: Re: [yocto] #yocto #dunfell External Email Alert This email has been sent from an account outside of the BAE Systems network= . Please treat the email with caution, especially if you are requested to cli= ck on a link, decrypt/open an attachment, or enable macros. For further in= formation on how to spot phishing, access "Cybersecurity OneSpace Page" and= report phishing by clicking the button "Report Phishing" on the Outlook to= olbar. Hi, SBSA is EDK2 based, which is basically incredibly painful to patch. The so= urce files are windows-style CR/LF so your patch needs to have CR/LF, but i= f the whole patch has CR/LF then git "helpfully" transforms the patch to ju= st unix-style LF, which doesn't apply. The "solution" (workaround) is to convert the patch to LF encoding, and man= ually add the CR characters to the end of each line in the patch body. The good news is that EDK2 is moving to LF encoding, so this will be solved= at some point. Ross From: yocto@lists.yoctoproject.org > on behalf = of Monsees, Steven C (US) via lists.yoctoproject.org > Date: Tuesday, 20 September 2022 at 16:05 To: Monsees, Steven C (US) >, yocto@lists.yoctoproject.org > Subject: Re: [yocto] #yocto #dunfell Any hints or ideas on what I might be doing wrong would be appreciated... From: yocto@lists.yoctoproject.org > On Behalf = Of Monsees, Steven C (US) via lists.yoctoproject.org Sent: Monday, September 19, 2022 2:22 PM To: yocto@lists.yoctoproject.org Subject: [yocto] #yocto #dunfell External Email Alert This email has been sent from an account outside of the BAE Systems network= . Please treat the email with caution, especially if you are requested to cli= ck on a link, decrypt/open an attachment, or enable macros. For further in= formation on how to spot phishing, access "Cybersecurity OneSpace Page" and= report phishing by clicking the button "Report Phishing" on the Outlook to= olbar. I am seeing an error when I attempt to apply a patch, and could use some cl= arification 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 t= he change: git diff -u console.c which I used as my patch: 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"}, I am getting the following error when the patch is applied: ERROR: efitools-native-1.7.0+gitAUTOINC+0649468475-r0 do_patch: Applying pa= tch 'console.patch' on target directory '/disk0/scratch/yocto/workspace/pok= y-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+gi= tAUTOINC+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-du= nfell-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/m= eta-limws/meta-intel/meta-sbca/recipes-bsp/efitools/efitools-native_git.bb:= do_patch) failed with exit code '1' Thanks, Steve --_000_fd2847932aac4912823c8363777bc740baesystemscom_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

=  

Thank= s… will give it a try.

=  

From:= Ross Burton <Ross.Burton@arm.com>
Sent: Tuesday, September 20, 2022 11:38 AM
To: Monsees, Steven C (US) <steven.monsees@baesystems.com>; yo= cto@lists.yoctoproject.org
Subject: Re: [yocto] #yocto #dunfell

 

External Email Alert

This email has been sent from an account outside of the BAE Systems net= work.

Please treat the email with caution, especi= ally if you are requested to click on a link, decrypt/open an attachment, o= r enable macros.  For further information on how to spot phishing, acc= ess “Cybersecurity OneSpace Page” and report phishing by clicking the button “Report Phishing” on the Outlo= ok toolbar.

 

Hi,<= o:p>

 

SBSA= is EDK2 based, which is basically incredibly painful to patch.  The s= ource files are windows-style CR/LF so your patch needs to have CR/LF, but = if the whole patch has CR/LF then git “helpfully” transforms th= e patch to just unix-style LF, which doesn’t apply.=

 

The = “solution” (workaround) is to convert the patch to LF encoding,= and manually add the CR characters to the end of each line in the patch bo= dy.

 

The = good news is that EDK2 is moving to LF encoding, so this will be solved at = some point.

 

Ross=

 

 

From: yocto@lists.yoctoproject.org <yocto@lists.yoctoproject.org&g= t; on behalf of Monsees, Steven C (US) via lists.yoctoproject.org <steven.monsees=3Dbaesystems.com@lists.yoctoproject.org>
Date: Tuesday, 20 September 2022 at 16:05
To: Monsees, Steven C (US) <steven.monsees@baesystems.com>, yocto@lists.yoctoproject.or= g <yocto@lists.yocto= project.org>
Subject: Re: [yocto] #yocto #dunfell

 = ;

Any h= ints or ideas on what I might be doing wrong would be appreciated…

 = ;

From:= yocto@lists.yoctoproject.or= g <yocto@lists.yocto= project.org> On Behalf Of Monsees, Steven C (US) via lists.yoctoproject.org
Sent: Monday, September 19, 2022 2:22 PM
To: yocto@lists.yoct= oproject.org
Subject: [yocto] #yocto #dunfell

 

External Email Alert

This email has been sent from an account outside of the BAE Systems net= work.

Please treat the email with caution, especi= ally if you are requested to click on a link, decrypt/open an attachment, o= r enable macros.  For further information on how to spot phishing, acc= ess “Cybersecurity OneSpace Page” and report phishing by clicking the button “Report Phishing” on the Outlo= ok toolbar.

 

 

I am seeing an erro= r 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 :&= nbsp; ”Patch console.patch does not apply (enforce with -f)” ?<= o:p>

How can I best reso= lve 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:

 

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_VIO= LATION,     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_F= AILURE,     L"Warning Write Failure"},

        {  EFI_WARN_BUFFER_= TOO_SMALL,  L"Warning Buffer Too Small"},<= /p>

 

I am getting the fo= llowing error when the patch is applied:

 

ERROR: efitools-nat= ive-1.7.0+gitAUTOINC+0649468475-r0 do_patch: Applying patch 'consol= e.patch' on target directory '/disk0/scratch/yocto/workspace/poky-dunfell-2= 3.0.19/builds/sbca-default/tmp/work/x86_64-linux/efitools-native/1.7.0+= gitAUTOINC+0649468475-r0/git'

Command Error: 'qui= lt --quiltrc /disk0/scratch/yocto/workspace/poky-dunfell-23.0.19/builds/sbc= a-default/tmp/work/x86_64-linux/efitools-native/1.7.0+gitAUTOINC+06= 49468475-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:

Applying patch cons= ole.patch

patching file lib/c= onsole.c

Hunk #1 FAILED at 3= 57.

1 out of 1 hunk FAI= LED -- rejects in file lib/console.c

Patch console.patch= does not apply (enforce with -f)

ERROR: Logfile of f= ailure stored in: /disk0/scratch/yocto/workspace/poky-dunfell-23.0.19/build= s/sbca-default/tmp/work/x86_64-linux/efitools-native/1.7.0+gitAUTOINC&#= 43;0649468475-r0/temp/log.do_patch.7615

ERROR: Task (/disk0= /scratch/yocto/workspace/poky-dunfell-23.0.19/meta-bae/meta-limws/meta-inte= l/meta-sbca/recipes-bsp/efitools/efitools-native_git.bb:do_patch) failed wi= th exit code '1'

 

Thanks,<= /span>

Steve

--_000_fd2847932aac4912823c8363777bc740baesystemscom_--