[yocto] do_patch through Yocto fails while "git am" succeed

Khem Raj raj.khem at gmail.com
Wed Jun 15 14:10:08 PDT 2016


On Fri, Jun 10, 2016 at 11:12 AM, Michael Hu <pxmyhdev at gmail.com> wrote:
> Does anyone know what's the difference between using Yocto to apply patches
> and apply patch directly using git command?
>
> I am trying to apply patches for arm-trusted-firmware through yocto by
> extending arm-trusted-firmware.bb file, in .bbappend file, I have:
>
> SRC_URI = "file://<some patch name>"
>
> I got the following error:
> ERROR: arm-trusted-firmware-1.2 do_patch: Command Error: 'quilt --quiltrc
> /build/tmp/sysroots/x86_64-linux/etc/quiltrc push' exited with 1  Output:
> Applying patch 0002-csu_dma-Added-support-to-load-PL-bitstream.patch
> (Stripping trailing CRs from patch.)
> ... some files can be patched
> patching file <failed file>
> Hunk #1 FAILED at 41.
> 1 out of 1 hunk FAILED -- rejects in file <failed file>
> Patch 0002-csu_dma-Added-support-to-load-PL-bitstream.patch does not apply
> (enforce with -f)
>
> However, if using "git am <patch>" under cloned arm-trusted-firmware git
> repo, the patches are successfully patched.
>
> What could be the difference?

which distro do you use on build host and version of quilt, there were
similar issues e..g with ubuntu 12.04
on applying patches that were generated with newer quilt versions.

>
> Thanks!
>
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>



More information about the yocto mailing list