[OE-core] Patch file search order in DORA (1.5)

[Otavio Salvador]

On Fri, Nov 1, 2013 at 12:36 PM, Richard Purdie
<richard.purdie at linuxfoundation.org> wrote:
> On Fri, 2013-11-01 at 15:57 +0200, Janis Coders wrote:
>> Hi, I am working on Freescale's BSP with my custom layer which overrides
>> (appends) the Linux kernel's recipe.
>> In version 1.4 my custom recipe's defconfig had priority over the
>> 'original' layer's defconfig, but in 1.5 the priority has
>> changed. After some debugging I found out that seems like order of patch
>> file searching has changed in version 1.5.
>>
>> Order in 1.4 (example):
>> DEBUG: Searching for defconfig in paths:
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/arm
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/armv7a
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/mx5
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/mx53
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/imx53be
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/poky
>> /home/chocis/projects/balticembedded-bsp/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/
>> /home/chocis/projects/balticembedded-bsp/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/arm
>> /home/chocis/projects/balticembedded-bsp/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/armv7a
>> /home/chocis/projects/balticembedded-bsp/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5
>>
>>      ......
>> Order in 1.5 (example):
>> /home/chocis/projects/testdorafreescale/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/poky
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm-extra/recipes-kernel/linux/linux-imx-2.6.35.3/poky
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/poky
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx/poky
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm/recipes-kernel/linux/files/poky
>> /home/chocis/projects/testdorafreescale/sources/meta-balticembedded/recipes-balticembedded/linux/linux-imx/imx53be
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm-extra/recipes-kernel/linux/linux-imx-2.6.35.3/imx53be
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53be
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm/recipes-kernel/linux/linux-imx/imx53be
>> /home/chocis/projects/testdorafreescale/sources/meta-fsl-arm/recipes-kernel/linux/files/imx53be
>>      .........
>>
>> Was this intended and specially changed in version 1.5? Because now I
>> have to move my defconfig one directory deeper
>> to get the priority.
>
> It was not in the 1.5 release however I have just realised it is in the
> dora branch and it is a change of behaviour there. I'm not sure it was
> intentionally included for 1.5.1 and that is something we need to
> discuss.
>
> http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=dora&id=0bd63125c3b44a656e44f2a76cc5f832c9db4bbd
>
> I would say that the change is in master and is intentional however and
> if you look at the search order, it does make more sense this way
> around. Any distro override file should come first, then say armv7, then
> armv6 and so on. In the original order, arm overrides armv7 which
> overrides machine specific which makes no sense.
>
> On those grounds it is a valid bug fix for 1.5.1 IMO.

The only thing which worries me is walking in same overrides across
layers. I'd expect it to respect the layer preference here.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750