[OE-core] [PATCH] file: remove the original magic.h

[Jack Mitchell]

On 26/03/15 11:31, Junling Zheng wrote:
> On 2015/3/26 17:54, Richard Purdie wrote:
>> On Thu, 2015-03-26 at 09:18 +0000, Junling Zheng wrote:
>>> The magic.h under the src/ directory should be generated by magic.h.in
>>> during compiling. However, if we modify the magic.h.in, we can find that
>>> sometimes the magic.h would not be generated again, and then we use the
>>> original one which is not correct. So remove the original magic.h.
>>>
>>> Signed-off-by: Junling Zheng <zhengjunling at huawei.com>
>>> ---
>>>   meta/recipes-devtools/file/file_5.22.bb | 6 ++++++
>>>   1 file changed, 6 insertions(+)
>>>
>>> diff --git a/meta/recipes-devtools/file/file_5.22.bb b/meta/recipes-devtools/file/file_5.22.bb
>>> index 9c6bb38..f4ee31b 100644
>>> --- a/meta/recipes-devtools/file/file_5.22.bb
>>> +++ b/meta/recipes-devtools/file/file_5.22.bb
>>> @@ -22,6 +22,12 @@ inherit autotools
>>>   
>>>   FILES_${PN} += "${datadir}/misc/*.mgc"
>>>   
>>> +do_configure_prepend() {
>>> +	if test -f "${B}/src/magic.h"; then
>>> +		rm -rf ${B}/src/magic.h
>>> +	fi
>>> +}
>>> +
>> If the task checksums change, ${B} should get entirely wiped out with
>> recent releases of the build system (e.g. dizzy/fido/master). Which
>> version was this tested and found to be needed with?
>>
>> Cheers,
>>
>> Richard
>>
> This is tested in the Yocto 1.5 poky-dora-10.0.0, which uses the dora branch of oe-core.
> But I don't know which version it is actually in oe-core. And I think all branches in
> oe-core need this fix.
>
> Should ${B} be replaced by ${S}? Although sometimes they're not the same:)
>
> And I am puzzled why ${B} should be wiped out, and does it be replaced by any other variable
> except ${S}?
>
> Cheers,
>
> Junling
>

Could this be related to my outstanding bug? There is definitely 
something odd going on around the file magic binary.

https://bugzilla.yoctoproject.org/show_bug.cgi?id=7232