diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-01-16 15:25:04 +0100 |
|---|---|---|
| committer | Ming Liu <ming.liu@toradex.int> | 2020-01-23 20:42:00 +0000 |
| commit | df77984fca2b4f0536df48b966f1043ffe7425fb (patch) | |
| tree | 776f14454aece394883a55efe875a7df498cec5c | |
| parent | fbd77af45f32e88e96d0efe0317d346a55e5580a (diff) | |
image_type_tezi.bbclass: introduce TEZI_DATE
Introduce TEZI_DATE variable, it defaults to ${TDX_MATRIX_BUILD_TIME}
but could be overridden in local.conf.
It will be used to set release_date in image json files, hence it must
be excluded by IMAGE_TYPEDEP_teziimg and IMAGE_CMD_teziimg-distro to
avoid running into basehash mismatch problems.
(cherry picked from commit 3decd1ad4bb0410a03abfda76a884351bba51fdd)
Signed-off-by: Ming Liu <ming.liu@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 1721c4d..db09bc2 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -17,6 +17,7 @@ DEPENDS += "${WKS_FILE_DEPENDS}" RM_WORK_EXCLUDE += "${PN}" TEZI_VERSION ?= "${DISTRO_VERSION}" +TEZI_DATE ?= "${TDX_MATRIX_BUILD_TIME}" TEZI_IMAGE_NAME ?= "${IMAGE_NAME}" TEZI_ROOT_FSTYPE ??= "ext4" TEZI_ROOT_LABEL ??= "RFS" @@ -264,7 +265,7 @@ def rootfs_tezi_json(d, flash_type, flash_data, json_file, uenv_file): data["name"] = d.getVar('SUMMARY') data["description"] = d.getVar('DESCRIPTION') data["version"] = d.getVar('TEZI_VERSION') - data["release_date"] = datetime.strptime(d.getVar('DATE', False), '%Y%m%d').date().isoformat() + data["release_date"] = datetime.strptime(d.getVar('TEZI_DATE'), '%Y%m%d%H%M%S').date().isoformat() data["u_boot_env"] = uenv_file if os.path.exists(os.path.join(deploydir, "prepare.sh")): data["prepare_script"] = "prepare.sh" @@ -372,7 +373,7 @@ IMAGE_CMD_teziimg () { do_image_teziimg[dirs] += "${WORKDIR}/image-json ${DEPLOY_DIR_IMAGE}" do_image_teziimg[cleandirs] += "${WORKDIR}/image-json" do_image_teziimg[prefuncs] += "rootfs_tezi_run_json" -IMAGE_TYPEDEP_teziimg[vardepsexclude] = "TEZI_VERSION" +IMAGE_TYPEDEP_teziimg[vardepsexclude] = "TEZI_VERSION TEZI_DATE" IMAGE_TYPEDEP_teziimg += "${TEZI_BOOT_SUFFIX} ${TEZI_ROOT_SUFFIX}" @@ -428,6 +429,6 @@ IMAGE_CMD_teziimg-distro () { ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_BOOT_SUFFIX} \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} } -IMAGE_CMD_teziimg-distro[vardepsexclude] = "TEZI_VERSION" +IMAGE_CMD_teziimg-distro[vardepsexclude] = "TEZI_VERSION TEZI_DATE" IMAGE_TYPEDEP_teziimg-distro += "${TEZI_BOOT_SUFFIX} ${TEZI_ROOT_SUFFIX}" |