Re: [PATCH 1/2] u-boot: Factor out common bits

On 09/05/2016 12:11 AM, Richard Purdie wrote:

On Sun, 2016-09-04 at 23:49 +0200, Marek Vasut wrote:

quoted

On 09/04/2016 11:28 PM, Richard Purdie wrote:

quoted

On Sun, 2016-09-04 at 18:21 +0200, Marek Vasut wrote:

quoted

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 <marex@denx.de>
---
 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 .

-- 
Best regards,
Marek Vasut