diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-12-02 15:32:40 +0000 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2019-12-03 09:56:13 +0000 |
| commit | f44a833b70c9d183598228996fb423fe5e742e0e (patch) | |
| tree | 1283064d99755c6ada57c9d48f5f9b8a3aed825e /recipes-images | |
| parent | 0563a51c7b308405068b1de8a56a820602498043 (diff) | |
tdx-extra: use new versioning
Drop PV to denote the image version. Using timestamps in PV causes
various issues. The image PV has not much meaning other than it has
been used by the Tezi image class. Sidestep by using DISTRO_VERSION
directly in the Tezi image class. See also:
http://lists.openembedded.org/pipermail/openembedded-core/2019-November/289765.html
Also only write /etc/issue in the do_rootfs task instead of writing
it in base-files first and then change it in do_rootfs. We sligtly
alter the login banner:
Before:
TDX X11 2.6-snapshot colibri-imx7-emmc ttymxc0
Colibri-iMX7-eMMC_Console-Image 3.0b2.65 20190830
With this change:
TDX X11 0.0.0-dev-20191103+build.12 (zeus) colibri-imx7-emmc ttymxc0
Colibri-iMX7-eMMC_Console-Image
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'recipes-images')
| -rw-r--r-- | recipes-images/images/tdx-extra.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/recipes-images/images/tdx-extra.inc b/recipes-images/images/tdx-extra.inc index 843ff47..ca4f684 100644 --- a/recipes-images/images/tdx-extra.inc +++ b/recipes-images/images/tdx-extra.inc @@ -6,13 +6,12 @@ COPY_LIC_MANIFEST ?= "1" COPY_LIC_DIRS ?= "1" add_rootfs_version () { - echo -n "${IMAGE_NAME} ${PV}" >> ${IMAGE_ROOTFS}/etc/issue - echo " ${TDX_VERDATE}" | sed 's/-//' >>${IMAGE_ROOTFS}/etc/issue - echo "" >> ${IMAGE_ROOTFS}/etc/issue + printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) \\\n \\\l\n" > ${IMAGE_ROOTFS}/etc/issue + printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) %%h\n" > ${IMAGE_ROOTFS}/etc/issue.net + printf "${IMAGE_NAME}\n\n" >> ${IMAGE_ROOTFS}/etc/issue + printf "${IMAGE_NAME}\n\n" >> ${IMAGE_ROOTFS}/etc/issue.net } -PV = "${TDX_VER_PACKAGE_MIN}" - # add the rootfs version to the welcome banner ROOTFS_POSTPROCESS_COMMAND += " add_rootfs_version;" |