From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by mail.openembedded.org (Postfix) with ESMTP id EADA877257 for ; Sun, 4 Sep 2016 22:33:20 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3sS71D3J2dz3hjV6; Mon, 5 Sep 2016 00:33:20 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3sS71D34RyzvkHr; Mon, 5 Sep 2016 00:33:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id gGQVwZflfRMk; Mon, 5 Sep 2016 00:33:19 +0200 (CEST) X-Auth-Info: 8NdYlflQf3ce3CiGySPvq9zmC8RxKW+In4uIKVrgpeE= Received: from [IPv6:::1] (unknown [195.140.253.167]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Mon, 5 Sep 2016 00:33:18 +0200 (CEST) To: Richard Purdie , openembedded-core@lists.openembedded.org References: <20160904162130.13313-1-marex@denx.de> <1473024487.20226.3.camel@linuxfoundation.org> <9f3a5dfd-8303-b6d0-cd5e-07f2aac7c588@denx.de> <1473027091.20226.4.camel@linuxfoundation.org> <252ea4f7-871c-60a5-0a2f-f59a5d35683e@denx.de> From: Marek Vasut Message-ID: <00e9ef55-2e08-5c92-0a5a-32e9ce1f61fa@denx.de> Date: Mon, 5 Sep 2016 00:33:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.2.0 MIME-Version: 1.0 In-Reply-To: <252ea4f7-871c-60a5-0a2f-f59a5d35683e@denx.de> Subject: Re: [PATCH 1/2] u-boot: Factor out common bits 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: Sun, 04 Sep 2016 22:33:21 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 09/05/2016 12:23 AM, Marek Vasut wrote: > On 09/05/2016 12:11 AM, Richard Purdie wrote: >> On Sun, 2016-09-04 at 23:49 +0200, Marek Vasut wrote: >>> On 09/04/2016 11:28 PM, Richard Purdie wrote: >>>> >>>> On Sun, 2016-09-04 at 18:21 +0200, Marek Vasut wrote: >>>>> >>>>> The u-boot recipes share a couple of common variables, which >>>>> makes >>>>> updating of the recipes error prone and a toil. Factor those >>>>> common >>>>> bits into u-boot-common.inc so that they are in one place. >>>>> >>>>> No functional change. >>>>> >>>>> Signed-off-by: Marek Vasut >>>>> --- >>>>> meta/recipes-bsp/u-boot/u-boot-common.inc | 16 >>>>> ++++++++++++++++ >>>>> meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb | 16 ++---- >>>>> ---- >>>>> ------ >>>>> meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb | 17 ++---- >>>>> ---- >>>>> ------- >>>>> meta/recipes-bsp/u-boot/u-boot.inc | 10 ++---- >>>>> ---- >>>>> meta/recipes-bsp/u-boot/u-boot_2016.03.bb | 7 ------- >>>>> 5 files changed, 22 insertions(+), 44 deletions(-) >>>>> create mode 100644 meta/recipes-bsp/u-boot/u-boot-common.inc >>>>> >>>>> diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc >>>>> b/meta/recipes-bsp/u-boot/u-boot-common.inc >>>>> new file mode 100644 >>>>> index 0000000..403e316 >>>>> --- /dev/null >>>>> +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc >>>>> @@ -0,0 +1,16 @@ >>>>> +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" >>>>> +SECTION = "bootloaders" >>>>> + >>>>> +LICENSE = "GPLv2+" >>>>> +LIC_FILES_CHKSUM = >>>>> "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" >>>>> + >>>>> +# This revision corresponds to the tag "v2016.03" >>>>> +# We use the revision in order to avoid having to fetch it from >>>>> the >>>>> +# repo during parse >>>>> +SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" >>>>> + >>>>> +PV = "v2016.03+git${SRCPV}" >>>>> + >>>>> +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" >>>>> + >>>>> +S = "${WORKDIR}/git" >>>> Since the common file you're creating is 2016.03 version specific, >>>> I'd >>>> be tempted to call it u-boot-common_2016.03.inc and then its clear >>>> its >>>> version specific... >>> Yes, except when new version of U-Boot comes out and we want to >>> perform >>> update of the u-boot{,mkimage,fw-utils} recipes, with this current >>> patch >>> as is, we'd only have to rename these recipes and change the version >>> in >>> u-boot-common.inc . With your proposal, we'd have to not only rename >>> the >>> recipes and tweak u-boot-common.inc, but also edit their content and >>> change the "require u-boot-common_20yy.mm.inc" bit, which adds some >>> toil. >> >> Unless its: >> >> require u-boot-common_${PV}.inc >> >> since it should be able to extract PV from the filename... > > Ah right, thanks :) > > I'll rebuild/retest and send a V2 . > I was a bit hasty, the u-boot.inc includes u-boot-common.inc without having PV set. Any idea how to deal with that ? -- Best regards, Marek Vasut