Hi Ross,

Thanks for your reply. I placed both original and updated files in the same 
directory where the original is and ran the command to generate patch file. 
Locations were updated correctly and it worked.

Thanks,
Monica

From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Wednesday, June 22, 2016 9:40 AM
To: Rajasekaran, Monica <monica.rajaseka...@us.fujitsu.com>
Cc: yocto@yoctoproject.org
Subject: Re: [yocto] Error applying patch - openvswitch


On 22 June 2016 at 15:34, Rajasekaran, Monica 
<monica.rajaseka...@us.fujitsu.com<mailto:monica.rajaseka...@us.fujitsu.com>> 
wrote:
|diff --git 
data/users/mrajase/l100_label_based_r100poc/repo/poky/build/tmp/work/core2-64-enea-linux/openvswitch/2.0.0-r0/openvswitch-2.0.0/ofproto/ofproto.c
 data/users/mrajase/extra/ofproto.c
|index ea812ad..76c355f 100644
|--- 
data/users/mrajase/l100_label_based_r100poc/repo/poky/build/tmp/work/core2-64-enea-linux/openvswitch/2.0.0-r0/openvswitch-2.0.0/ofproto/ofproto.c
|+++ data/users/mrajase/extra/ofproto.c

This is the problem, your filename paths are messed up because of how you 
generated the patch: it looks like your data/ directory is git-managed so git 
did what you told it and generated a patch with the full paths in.

The easy solution here is to use "devtool modify" (see the manual) but you can 
hand-edit the patch to remove everything from data/ to 2.0.0-r0/ and it should 
apply.

Ross
-- 
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Reply via email to