#yocto #dunfell #yocto #dunfell

Monsees, Steven C (US)


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:


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 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'




Join {yocto@lists.yoctoproject.org to automatically receive all group messages.