From aa6434d4d61ad84fe22b91adf2e380a3a63011f5 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 3 Jun 2020 13:07:46 +0200 Subject: u-boot-toradex: inherit toradex-u-boot-localversion - Inherit toradex-u-boot-localversion instead of fsl-u-boot-localversion in u-boot-toradex-common_2018.03.inc. - Drop LOCALVERSION which has already been defined in toradex-u-boot-localversion.bbclass. Signed-off-by: Ming Liu --- recipes-bsp/u-boot/u-boot-toradex-common.inc | 2 +- recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-toradex-common.inc b/recipes-bsp/u-boot/u-boot-toradex-common.inc index 25a6ff9..8ea2cc6 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" PE = "1" PV = "2019.07+git${SRCPV}" -LOCALVERSION = "-${TDX_VERSION}" + inherit toradex-u-boot-localversion # We use the revision in order to avoid having to fetch it from the diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc index 9b8655d..c686432 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc @@ -13,9 +13,7 @@ SRCBRANCH = "toradex_imx_v2018.03_4.14.98_2.3.0_bringup" S = "${WORKDIR}/git" -inherit fsl-u-boot-localversion - -LOCALVERSION ?= "-${SRCBRANCH}" +inherit toradex-u-boot-localversion COMPATIBLE_MACHINE = "(mx8)" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3