From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <richard.purdie@linuxfoundation.org>
Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161])
	by mail.openembedded.org (Postfix) with ESMTP id A12746013D
	for <openembedded-core@lists.openembedded.org>;
	Thu, 26 Mar 2015 09:54:59 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id
	t2Q9sfuK001097; Thu, 26 Mar 2015 09:54:41 GMT
Received: from dan.rpsys.net ([127.0.0.1])
	by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id g3Z7H1yZpgii; Thu, 26 Mar 2015 09:54:41 +0000 (GMT)
Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0)
	by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id
	t2Q9sQQ2001094
	(version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT);
	Thu, 26 Mar 2015 09:54:37 GMT
Message-ID: <1427363666.14020.62.camel@linuxfoundation.org>
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Junling Zheng <zhengjunling@huawei.com>
Date: Thu, 26 Mar 2015 09:54:26 +0000
In-Reply-To: <1427361482-5775-1-git-send-email-zhengjunling@huawei.com>
References: <1427361482-5775-1-git-send-email-zhengjunling@huawei.com>
X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 
Mime-Version: 1.0
Cc: peifeiyue@huawei.com, openembedded-core@lists.openembedded.org
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
	<openembedded-core.lists.openembedded.org>
List-Unsubscribe: <http://lists.openembedded.org/mailman/options/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=unsubscribe>
List-Archive: <http://lists.openembedded.org/pipermail/openembedded-core/>
List-Post: <mailto:openembedded-core@lists.openembedded.org>
List-Help: <mailto:openembedded-core-request@lists.openembedded.org?subject=help>
List-Subscribe: <http://lists.openembedded.org/mailman/listinfo/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Mar 2015 09:55:01 -0000
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

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@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