[meta-freescale] Update 'meta' layer recipes in imx-4.1.15-1.2.0_ga

[Tarun Tej K]

Hi,

I am using the BSP version imx-4.1.15-1.2.0_ga
<http://git.freescale.com/git/cgit.cgi/imx/fsl-arm-yocto-bsp.git/log/?h=imx-4.1.15-1.0.0_ga>
.
What is the best way to update the recipes in 'poky/meta/' layer with
latest versions from
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta without affecting
the changes done in other layers as well as custom layers.

Does 'repo sync' command only updates layers with revision mentioned in
manifest.xml or default.xml. Is that correct?

I tried -
 1. manually copying new versions of required recipes in the respective
locations but it has lot of dependency issues include bitbake utils.
2. 'git pull yocto master' inside poky folder. This resulted in 100s of
merge conflicts
Is there any efficient way for doing this?

Thanks
Tarun
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/meta-freescale/attachments/20180906/626b51ad/attachment.html>