diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-12-02 15:07:30 +0000 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2019-12-18 10:25:21 +0000 |
| commit | 74ad3a824ec843f94b918dd7e5e39cbfa085a1c7 (patch) | |
| tree | 3606a0bbea7cd6aef6484fbbdf1b80606a0f54e7 | |
| parent | cd821093f7fc5d2fd5a15891f8d694836b3a5815 (diff) | |
u-boot-toradex: use new versioning
Use toradex-u-boot-localversion class to implement the new versioning
scheme for U-Boot.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | classes/tegra-u-boot-localversion.bbclass | 29 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc | 6 |
2 files changed, 1 insertions, 34 deletions
diff --git a/classes/tegra-u-boot-localversion.bbclass b/classes/tegra-u-boot-localversion.bbclass deleted file mode 100644 index c7de249..0000000 --- a/classes/tegra-u-boot-localversion.bbclass +++ /dev/null @@ -1,29 +0,0 @@ -# Toradex Tegra U-Boot LOCALVERSION extension -# -# This allow to easy reuse of code between different U-Boot recipes -# -# The following options are supported: -# -# SCMVERSION Puts the Git hash in U-Boot local version -# LOCALVERSION Value used in LOCALVERSION (default to '+fslc') -# -# Copied from meta-freescale/classes/fsl-u-boot-localversion.bbclass -# Copyright 2014 (C) O.S. Systems Software LTDA. -# Copyright 2017 (C) Toradex Inc. - -SCMVERSION ??= "y" -LOCALVERSION ??= "-${TDX_VER_ITEM}" - -UBOOT_LOCALVERSION = "${LOCALVERSION}" - -do_compile_prepend() { - if [ "${SCMVERSION}" = "y" ]; then - # Add GIT revision to the local version - head=`cd ${S} ; git rev-parse --verify --short HEAD 2> /dev/null` - printf "%s%s%s" "${UBOOT_LOCALVERSION}" +g $head > ${S}/.scmversion - printf "%s%s%s" "${UBOOT_LOCALVERSION}" +g $head > ${B}/.scmversion - else - printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion - printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion - fi -} diff --git a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc index ed5cf49..907b3f4 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" PE = "1" PV = "2019.07+git${SRCPV}" -LOCALVERSION = "-${TDX_VER_ITEM}" -inherit tegra-u-boot-localversion +inherit toradex-u-boot-localversion # We use the revision in order to avoid having to fetch it from the # repo during parse @@ -20,6 +19,3 @@ SRCBRANCH_use-head-next = "toradex_2019.07-next" SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" - -# defaults -TDX_VER_ITEM ??= "0" |