diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-05-19 17:44:21 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-05-22 10:04:19 +0200 |
commit | 0d02e0bd8b423c642cec0e997ceadd89ffb9a0de (patch) | |
tree | 72077207ab5097f0ad3f831b2adbe0c5af72a2a5 /recipes-images | |
parent | 9700c50edb21900c4fdbf84ead8d5c8e0a88733d (diff) |
images: simplify prepending a machine name
Define the string used for each machine in the machine configuration
rather than doing this in each image recipe.
Fallback to machine configuration name if not defined.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-images')
-rw-r--r-- | recipes-images/images/console-tdx-image.bb | 11 | ||||
-rw-r--r-- | recipes-images/images/lxde-image.bb | 11 | ||||
-rw-r--r-- | recipes-images/images/lxqt-image.bb | 11 | ||||
-rw-r--r-- | recipes-images/images/qt5-x11-image.bb | 11 |
4 files changed, 8 insertions, 36 deletions
diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb index 1abd539..fa9cc73 100644 --- a/recipes-images/images/console-tdx-image.bb +++ b/recipes-images/images/console-tdx-image.bb @@ -6,15 +6,8 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "Console-Image" -IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${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-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" +MACHINE_NAME ?= "${MACHINE}" +IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" diff --git a/recipes-images/images/lxde-image.bb b/recipes-images/images/lxde-image.bb index 44121d9..3827566 100644 --- a/recipes-images/images/lxde-image.bb +++ b/recipes-images/images/lxde-image.bb @@ -6,15 +6,8 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "LXDE-Image" -IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${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-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" +MACHINE_NAME ?= "${MACHINE}" +IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" diff --git a/recipes-images/images/lxqt-image.bb b/recipes-images/images/lxqt-image.bb index 157d96e..e2f2fc2 100644 --- a/recipes-images/images/lxqt-image.bb +++ b/recipes-images/images/lxqt-image.bb @@ -6,15 +6,8 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "LXQt-Image" -IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${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-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" +MACHINE_NAME ?= "${MACHINE}" +IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb index acd9bba..8436515 100644 --- a/recipes-images/images/qt5-x11-image.bb +++ b/recipes-images/images/qt5-x11-image.bb @@ -11,15 +11,8 @@ LICENSE = "MIT" #start of the resulting deployable tarball name export IMAGE_BASENAME = "Qt5-X11-Image" -IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${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-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" +MACHINE_NAME ?= "${MACHINE}" +IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}" IMAGE_FEATURES += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ |