diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-12-02 13:43:53 +0000 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2019-12-16 09:34:33 +0000 |
| commit | e1cc68aa31fd0e09ccdb893871b5f08f63e27a8b (patch) | |
| tree | 19bfb4bd963702de88826b4d1e84b89b8f7739a6 | |
| parent | 93c745f47e217282970ed65e0a725256eae43b62 (diff) | |
tdx-base: implement new version number
Implement new version number scheme. This has been tested recently in
meta-toradex-torizon and proven to work reliably. Lets move it to
meta-toradex-distro so all Toradex distribution can make use of it.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | conf/distro/include/tdx-base.inc | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index b8e61a3..869e3f6 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -4,21 +4,29 @@ require conf/distro/include/arm-defaults.inc DISTRO = "tdx-base" DISTRO_NAME = "Toradex Distro Base" -# These variables are used to set image, kernel and U-Boot versions -# increment TDX_VERMINOR in meta-toradex-demos/classes/toradex-mirrors.bbclass - -TDX_VERMAJOR = "0" -TDX_VERMINOR = "0" -TDX_VERBETA = "b0" -TDX_VERPATCH = "0" -TDX_BUILDNB ?= "" -TDX_VERNIGHTLY ?= "" -TDX_VERDATE ?= "-${DATE}" -TDX_VERDATE[vardepsexclude] = "DATE" - -TDX_VER_PACKAGE_MIN = "${TDX_VERMAJOR}.${TDX_VERMINOR}${TDX_VERBETA}${TDX_BUILDNB}${TDX_VERNIGHTLY}" -TDX_VER_PACKAGE = "${TDX_VER_PACKAGE_MIN}${TDX_VERDATE}" -TDX_VER_ITEM = "${TDX_VERMAJOR}.${TDX_VERMINOR}.${TDX_VERPATCH}" +TDX_BUILDNBR ?= "0" +TDX_PURPOSE ?= "Testing" + +def get_tdx_prerelease(purpose, datetime): + if purpose == "Testing": + return '-devel-%s' % (datetime) + elif purpose == "Nightly": + return '-devel-%s' % (datetime[:8]) + elif purpose == "Monthly": + return '-devel-%s' % (datetime[:6]) + elif purpose == "Release": + return '' + else: + return '-devel-%s' % (datetime) + +TDX_BUILD ?= "+build.${TDX_BUILDNBR}" +TDX_MATRIX_BUILD_TIME ?= "${DATETIME}" +TDX_MATRIX_BUILD_TIME[vardepsexclude] = "DATETIME" +TDX_PRERELEASE ?= "${@get_tdx_prerelease(d.getVar('TDX_PURPOSE'), d.getVar('TDX_MATRIX_BUILD_TIME'))}" +TDX_RELEASE ?= "0.0.0" + +# Complete image version with date and build number +DISTRO_VERSION = "${TDX_RELEASE}${TDX_PRERELEASE}${TDX_BUILD}" SDK_VENDOR = "-tdxsdk" SDK_NAME_PREFIX = "${DISTRO}" |