From 9ec772bd417d9ba7633ad3698919bb8060658cf3 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 27 Mar 2017 20:05:43 +0200 Subject: u-boot: use the new version variables Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb | 5 ++++- recipes-bsp/u-boot/u-boot-toradex_2016.11.bb | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb index 0c6997d..dc6c650 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb @@ -6,6 +6,8 @@ PROVIDES = "u-boot-fw-utils" RPROVIDES_${PN} = "u-boot-fw-utils" DEPENDS = "mtd-utils" +include conf/tdx_version.conf + COMPATIBLE_MACHINE = "(apalis-imx6|colibri-imx6|colibri-imx7|colibri-vf)" DEFAULT_PREFERENCE_apalis-imx6 = "1" DEFAULT_PREFERENCE_colibri-imx6 = "1" @@ -22,7 +24,8 @@ SRC_URI = " \ " SRC_URI_append_mx6 = " file://fw_unlock_mmc.sh " -PV = "v2016.11-v2.7b1+git${SRCPV}" +PV = "2016.11" +PR = "${TDX_VER_INT}-gitr${@d.getVar("SRCREV", False)[0:7]}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb index e778bc1..e8d50bd 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb @@ -1,6 +1,8 @@ -include recipes-bsp/u-boot/u-boot-toradex.inc +require recipes-bsp/u-boot/u-boot-toradex.inc +include conf/tdx_version.conf -PV = "v2016.11-v2.7b1+git${SRCPV}" +PV = "2016.11" +PR = "${TDX_VER_INT}-gitr${@d.getVar("SRCREV", False)[0:7]}" LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -- cgit v1.2.3