From 779bfed46f1d87ea1b6521c62d1e2152559918b9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sun, 27 Aug 2017 12:55:55 +0200 Subject: tdx-image-fstype.inc: set PV to Toradex image version Use PV variable to define the image version. With that the Tezi image class can use OpenEmbedded variables to get the image version. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- recipes-images/images/angstrom-lxde-image.bb | 2 -- recipes-images/images/angstrom-qt-x11-image.bb | 2 -- recipes-images/images/angstrom-qt5-x11-image.bb | 2 -- recipes-images/images/console-tdx-image.bb | 2 -- recipes-images/images/qt4e-demo-image.bb | 2 -- recipes-images/images/tdx-image-fstype.inc | 3 ++- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/recipes-images/images/angstrom-lxde-image.bb b/recipes-images/images/angstrom-lxde-image.bb index 2f3abba..b876e3c 100644 --- a/recipes-images/images/angstrom-lxde-image.bb +++ b/recipes-images/images/angstrom-lxde-image.bb @@ -2,8 +2,6 @@ SUMMARY = "Toradex Embedded Linux Demo with LXDE" LICENSE = "MIT" -PV = "${TDX_VER_INT}" - #start of the resulting deployable tarball name export IMAGE_BASENAME = "LXDE-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" diff --git a/recipes-images/images/angstrom-qt-x11-image.bb b/recipes-images/images/angstrom-qt-x11-image.bb index 4ea7ef0..39c7119 100644 --- a/recipes-images/images/angstrom-qt-x11-image.bb +++ b/recipes-images/images/angstrom-qt-x11-image.bb @@ -2,8 +2,6 @@ SUMMARY = "Toradex Embedded Linux Qt4 Demo With X11" LICENSE = "MIT" -PV = "${TDX_VER_INT}" - #start of the resulting deployable tarball name export IMAGE_BASENAME = "Qt4-X11-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" diff --git a/recipes-images/images/angstrom-qt5-x11-image.bb b/recipes-images/images/angstrom-qt5-x11-image.bb index 7371c56..40456b9 100644 --- a/recipes-images/images/angstrom-qt5-x11-image.bb +++ b/recipes-images/images/angstrom-qt5-x11-image.bb @@ -6,8 +6,6 @@ SUMMARY = "Toradex Embedded Linux Qt5 Demo With X11" LICENSE = "MIT" -PV = "${TDX_VER_INT}" - #start of the resulting deployable tarball name export IMAGE_BASENAME = "Qt5-X11-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb index 2a562bc..050f2cb 100644 --- a/recipes-images/images/console-tdx-image.bb +++ b/recipes-images/images/console-tdx-image.bb @@ -2,8 +2,6 @@ SUMMARY = "Toradex Embedded Linux Console Demo" LICENSE = "MIT" -PV = "${TDX_VER_INT}" - #start of the resulting deployable tarball name export IMAGE_BASENAME = "Console-Image" IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb index 0fb117b..a17968a 100644 --- a/recipes-images/images/qt4e-demo-image.bb +++ b/recipes-images/images/qt4e-demo-image.bb @@ -2,8 +2,6 @@ SUMMARY = "Toradex Embedded Linux Qt4 Demo With QWS" LICENSE = "MIT" -PV = "${TDX_VER_INT}" - #start of the resulting deployable tarball name export IMAGE_BASENAME = "Qt4e-Image" IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc index 1057a2d..83754b9 100644 --- a/recipes-images/images/tdx-image-fstype.inc +++ b/recipes-images/images/tdx-image-fstype.inc @@ -2,8 +2,9 @@ include conf/tdx_version.conf +PV = "${TDX_VER_EXT_MIN}" BURNFLASH := "${THISDIR}/files/${MACHINE}" -IMAGE_DIR = "${IMAGE_NAME}_${PV}" +IMAGE_DIR = "${IMAGE_NAME}_${TDX_VER_INT}" IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs" UBOOT_EXT = "bin" -- cgit v1.2.3