From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Greylist: delayed 1213 seconds by postgrey-1.34 at layers.openembedded.org; Thu, 26 Mar 2015 12:18:10 UTC Received: from owm.eumx.net (eumx.net [91.82.101.43]) by mail.openembedded.org (Postfix) with ESMTP id 2429D6013D for ; Thu, 26 Mar 2015 12:18:10 +0000 (UTC) Message-ID: <5513F450.1010701@communistcode.co.uk> Date: Thu, 26 Mar 2015 11:58:08 +0000 From: Jack Mitchell User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: openembedded-core@lists.openembedded.org References: <1427361482-5775-1-git-send-email-zhengjunling@huawei.com> <1427363666.14020.62.camel@linuxfoundation.org> <5513EE0B.5070802@huawei.com> In-Reply-To: <5513EE0B.5070802@huawei.com> Subject: Re: [PATCH] file: remove the original magic.h X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 12:18:11 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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 >>> --- >>> 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