[meta-xilinx] trying to build core-image-zynq with yocto exposes conflicting patch files

[Elvis Dowson]

On Apr 1, 2013, at 20:55, "Robert P. J. Day" <rpjday at crashcourse.ca> wrote:

> On Mon, 1 Apr 2013, Elvis Dowson wrote:
> 
>> 
>> On Apr 1, 2013, at 6:30 PM, "Robert P. J. Day" <rpjday at crashcourse.ca> wrote:
>> 
>>> 
>>> (aside: hoping this is the right place for this. i just purchased a
>>> zedboard and i want to build bootable images for it both from scratch,
>>> and using oe/yocto. would those approaches represent two separate
>>> forums i should be using?)
>>> 
>>> with fully-updated oe-core and meta-zynq yocto layers, i tried to
>>> build "core-image-zynq" and got:
>>> 
>>> ERROR: Command Error: exit status: 1  Output:
>>> Applying patch no-gtk.patch
>>> patching file Makefile
>>> Hunk #1 FAILED at 1.
>>> 1 out of 1 hunk FAILED -- rejects in file Makefile
>>> Patch no-gtk.patch does not apply (enforce with -f)
>>> ERROR: Function failed: patch_do_patch
>>> 
>>> this is not surprising since oe-core supplies a recipe for
>>> latencytop that includes the patch latencytop-makefile.patch which
>>> includes:
>>> 
>>> -HAS_GTK_GUI = 1
>>> 
>>> while the meta-zynq layer appends to the latencytop recipe by adding
>>> the no-gtk.patch which does exactly the same thing:
>>> 
>>> -HAS_GTK_GUI = 1
>>> 
>>> so, predictably, the full patch phase fails. how should that be
>>> properly resolved?
>> 
>> 
>> I just took a look at Philips' repo, it doesn't have an image to build core-image-zynq,
>> that is the one in the windriver recipe.
>> 
>> https://github.com/balister/meta-zynq/tree/master/recipes-core/images
>> 
>> You're using the WindRiver repo, which is located here:
>> 
>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-zynq/tree/recipes-core/images
>> 
>> core-image-minimal should work with either philip's or the meta-xilinx layers.
> 
>  ok, then i've got something screwy going on here, i'll figure out
> what it is.


Just remove the conflict diff entries in the meta-zynq layer to proceed! :-)

Elvis Dowson