summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-03-27 20:33:47 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-07 14:52:59 +0200
commite9dfea67735af64cf10c3f8ce8bb8fd08ccf47a9 (patch)
tree64f57bf6a560124e58621b51b730db6b767426f8
parent93ee682926ac8e7df5723acc5babf33557d27fae (diff)
images: rename the image type name
LXDE: LinuxImage -> LXDE-Image Qt4: LinuxImage-qt -> Qt4-X11-Image Qt4 embedded: LinuxImage-qte -> Qt4e-Image Qt5: LinuxImage-qt5 -> Qt5-X11-Image Console: LinuxConsoleImage -> Console-Image Additionaly the underscore in the machine name is replaced by a dash so that the image name is now comprised of 3 elements which themselfes do not contain an underscore but are separated by underscores. <machine>_<image type>_version e.g.: Apalis_iMX6_LinuxImageV2.7_20170327.tar.bz2 becomes Apalis-iMX6_LXDE-Image_2.7b2-20170327.tar.bz2 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-images/images/angstrom-lxde-image.bb25
-rw-r--r--recipes-images/images/angstrom-qt-x11-image.bb25
-rw-r--r--recipes-images/images/angstrom-qt5-x11-image.bb25
-rw-r--r--recipes-images/images/console-trdx-image.bb27
-rw-r--r--recipes-images/images/qt4e-demo-image.bb9
5 files changed, 54 insertions, 57 deletions
diff --git a/recipes-images/images/angstrom-lxde-image.bb b/recipes-images/images/angstrom-lxde-image.bb
index ae413c6..2424c35 100644
--- a/recipes-images/images/angstrom-lxde-image.bb
+++ b/recipes-images/images/angstrom-lxde-image.bb
@@ -5,17 +5,18 @@ LICENSE = "MIT"
PV = "${TDX_VER_INT}"
#start of the resulting deployable tarball name
-IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage"
-IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage"
-IMAGE_NAME_apalis-tk1 = "Apalis_TK1_LinuxImage"
-IMAGE_NAME_apalis-tk1-mainline = "Apalis_TK1_Mainline_LinuxImage"
-IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxImage"
-IMAGE_NAME_colibri-imx7 = "Colibri_iMX7_LinuxImage"
-IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage"
-IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage"
-IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage"
-IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage"
-IMAGE_NAME = "${MACHINE}_LinuxImage"
+export IMAGE_BASENAME = "LXDE-Image"
+IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
+IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -255,6 +256,4 @@ IMAGE_INIT_MANAGER = "systemd"
IMAGE_INITSCRIPTS = " "
IMAGE_LOGIN_MANAGER = "busybox shadow"
-export IMAGE_BASENAME = "LXDE-image"
-
inherit core-image
diff --git a/recipes-images/images/angstrom-qt-x11-image.bb b/recipes-images/images/angstrom-qt-x11-image.bb
index 5cdaf4d..ada83c1 100644
--- a/recipes-images/images/angstrom-qt-x11-image.bb
+++ b/recipes-images/images/angstrom-qt-x11-image.bb
@@ -5,17 +5,18 @@ LICENSE = "MIT"
PV = "${TDX_VER_INT}"
#start of the resulting deployable tarball name
-IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage-qt"
-IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage-qt"
-IMAGE_NAME_apalis-tk1 = "Apalis_TK1_LinuxImage-qt"
-IMAGE_NAME_apalis-tk1-mainline = "Apalis_TK1_Mainline_LinuxImage-qt"
-IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxImage-qt"
-IMAGE_NAME_colibri-imx7 = "Colibri_iMX7_LinuxImage-qt"
-IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qt"
-IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage-qt"
-IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage-qt"
-IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage-qt"
-IMAGE_NAME = "${MACHINE}_LinuxImage-qt"
+export IMAGE_BASENAME = "Qt4-X11-Image"
+IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
+IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -255,6 +256,4 @@ IMAGE_INIT_MANAGER = "systemd"
IMAGE_INITSCRIPTS = " "
IMAGE_LOGIN_MANAGER = "busybox shadow"
-export IMAGE_BASENAME = "qt-image"
-
inherit core-image
diff --git a/recipes-images/images/angstrom-qt5-x11-image.bb b/recipes-images/images/angstrom-qt5-x11-image.bb
index 59e95f1..b3578fc 100644
--- a/recipes-images/images/angstrom-qt5-x11-image.bb
+++ b/recipes-images/images/angstrom-qt5-x11-image.bb
@@ -9,17 +9,18 @@ LICENSE = "MIT"
PV = "${TDX_VER_INT}"
#start of the resulting deployable tarball name
-IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage-qt5"
-IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage-qt5"
-IMAGE_NAME_apalis-tk1 = "Apalis_TK1_LinuxImage-qt5"
-IMAGE_NAME_apalis-tk1-mainline = "Apalis_TK1_Mainline_LinuxImage-qt5"
-IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxImage-qt5"
-IMAGE_NAME_colibri-imx7 = "Colibri_iMX7_LinuxImage-qt5"
-IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qt5"
-IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage-qt5"
-IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage-qt5"
-IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage-qt5"
-IMAGE_NAME = "${MACHINE}_LinuxImage-qt5"
+export IMAGE_BASENAME = "Qt5-X11-Image"
+IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
+IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -231,6 +232,4 @@ IMAGE_INIT_MANAGER = "systemd"
IMAGE_INITSCRIPTS = " "
IMAGE_LOGIN_MANAGER = "busybox shadow"
-export IMAGE_BASENAME = "qt5-image"
-
inherit core-image
diff --git a/recipes-images/images/console-trdx-image.bb b/recipes-images/images/console-trdx-image.bb
index 6f09992..1e196d6 100644
--- a/recipes-images/images/console-trdx-image.bb
+++ b/recipes-images/images/console-trdx-image.bb
@@ -5,17 +5,20 @@ LICENSE = "MIT"
PV = "${TDX_VER_INT}"
#start of the resulting deployable tarball name
-IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxConsoleImage"
-IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxConsoleImage"
-IMAGE_NAME_apalis-tk1 = "Apalis_TK1_LinuxConsoleImage"
-IMAGE_NAME_apalis-tk1-mainline = "Apalis_TK1_Mainline_LinuxConsoleImage"
-IMAGE_NAME_colibri-imx6 = "Colibri_iMX6_LinuxConsoleImage"
-IMAGE_NAME_colibri-imx7 = "Colibri_iMX7_LinuxConsoleImage"
-IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxConsoleImage"
-IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxConsoleImage"
-IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxConsoleImage"
-IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxConsoleImage"
-IMAGE_NAME = "${MACHINE}_LinuxConsoleImage"
+export IMAGE_BASENAME = "Console-Image"
+IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}"
+IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
+IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
+
+SYSTEMD_DEFAULT_TARGET = "graphical.target"
#create the deployment directory-tree
require recipes-images/images/trdx-image-fstype.inc
@@ -56,6 +59,4 @@ IMAGE_INIT_MANAGER = "systemd"
IMAGE_INITSCRIPTS = " "
IMAGE_LOGIN_MANAGER = "busybox shadow"
-export IMAGE_BASENAME = "console-trdx-image"
-
inherit image
diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb
index b94a5de..c851c67 100644
--- a/recipes-images/images/qt4e-demo-image.bb
+++ b/recipes-images/images/qt4e-demo-image.bb
@@ -5,9 +5,10 @@ LICENSE = "MIT"
PV = "${TDX_VER_INT}"
#start of the resulting deployable tarball name
-IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qte"
-IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage-qte"
-IMAGE_NAME = "${MACHINE}_LinuxImage-qte"
+export IMAGE_BASENAME = "Qt4e-Image"
+IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
+IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
#start graphical target by default (start new qt-demo-init systemd service)
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -57,6 +58,4 @@ IMAGE_INIT_MANAGER = "systemd"
IMAGE_INITSCRIPTS = " "
IMAGE_LOGIN_MANAGER = "busybox shadow"
-export IMAGE_BASENAME = "qt-image"
-
inherit core-image