From 1ab4411e1d81ff792ad0527f8ed388da2f82f09e Mon Sep 17 00:00:00 2001
From: Philippe Schenker <philippe.schenker@toradex.com>
Date: Tue, 14 Jul 2020 18:30:43 +0200
Subject: images: rename toradex reference images

console-tdx-image.bb -> tdx-reference-minimal-image.bb
verification-tdx-image.bb -> tdx-reference-multimedia-image.bb

Related-to: ELB-2838
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
 recipes-images/images/console-tdx-image.bb         | 41 ----------------------
 recipes-images/images/graphical-tdx-image.bb       |  2 +-
 .../images/tdx-reference-minimal-image.bb          | 41 ++++++++++++++++++++++
 .../images/tdx-reference-multimedia-image.bb       | 23 ++++++++++++
 recipes-images/images/verification-tdx-image.bb    | 23 ------------
 5 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 recipes-images/images/console-tdx-image.bb
 create mode 100644 recipes-images/images/tdx-reference-minimal-image.bb
 create mode 100644 recipes-images/images/tdx-reference-multimedia-image.bb
 delete mode 100644 recipes-images/images/verification-tdx-image.bb

diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb
deleted file mode 100644
index 3784272..0000000
--- a/recipes-images/images/console-tdx-image.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit core-image
-
-SUMMARY = "Toradex Embedded Linux Console Image"
-DESCRIPTION = "Image without graphical interface"
-
-LICENSE = "MIT"
-
-#Prefix to the resulting deployable tarball name
-export IMAGE_BASENAME = "Console-Image"
-MACHINE_NAME ?= "${MACHINE}"
-IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}"
-
-# Copy Licenses to image /usr/share/common-license
-COPY_LIC_MANIFEST ?= "1"
-COPY_LIC_DIRS ?= "1"
-
-add_rootfs_version () {
-    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
-}
-# add the rootfs version to the welcome banner
-ROOTFS_POSTPROCESS_COMMAND += " add_rootfs_version;"
-
-IMAGE_LINGUAS = "en-us"
-#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
-
-CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client"
-
-IMAGE_INSTALL += " \
-    packagegroup-boot \
-    packagegroup-basic \
-    packagegroup-base-tdx-cli \
-    packagegroup-machine-tdx-cli \
-    packagegroup-wifi-tdx-cli \
-    packagegroup-wifi-fw-tdx-cli \
-    udev-extraconf \
-    ${CONMANPKGS} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'timestamp-service', '', d)} \
-"
diff --git a/recipes-images/images/graphical-tdx-image.bb b/recipes-images/images/graphical-tdx-image.bb
index 3b101b7..169b05b 100644
--- a/recipes-images/images/graphical-tdx-image.bb
+++ b/recipes-images/images/graphical-tdx-image.bb
@@ -1,4 +1,4 @@
-require console-tdx-image.bb
+require tdx-reference-minimal-image.bb
 
 SUMMARY = "Toradex Embedded Linux Graphical Image"
 DESCRIPTION = "Image with a graphical interface, either using weston or X11"
diff --git a/recipes-images/images/tdx-reference-minimal-image.bb b/recipes-images/images/tdx-reference-minimal-image.bb
new file mode 100644
index 0000000..938a5dd
--- /dev/null
+++ b/recipes-images/images/tdx-reference-minimal-image.bb
@@ -0,0 +1,41 @@
+inherit core-image
+
+SUMMARY = "Toradex Embedded Linux Reference Minimal Image"
+DESCRIPTION = "Minimal image without graphical interface that just boots"
+
+LICENSE = "MIT"
+
+#Prefix to the resulting deployable tarball name
+export IMAGE_BASENAME = "Reference-Minimal-Image"
+MACHINE_NAME ?= "${MACHINE}"
+IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}"
+
+# Copy Licenses to image /usr/share/common-license
+COPY_LIC_MANIFEST ?= "1"
+COPY_LIC_DIRS ?= "1"
+
+add_rootfs_version () {
+    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
+}
+# add the rootfs version to the welcome banner
+ROOTFS_POSTPROCESS_COMMAND += " add_rootfs_version;"
+
+IMAGE_LINGUAS = "en-us"
+#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
+
+CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client"
+
+IMAGE_INSTALL += " \
+    packagegroup-boot \
+    packagegroup-basic \
+    packagegroup-base-tdx-cli \
+    packagegroup-machine-tdx-cli \
+    packagegroup-wifi-tdx-cli \
+    packagegroup-wifi-fw-tdx-cli \
+    udev-extraconf \
+    ${CONMANPKGS} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'timestamp-service', '', d)} \
+"
diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb
new file mode 100644
index 0000000..968b5c9
--- /dev/null
+++ b/recipes-images/images/tdx-reference-multimedia-image.bb
@@ -0,0 +1,23 @@
+require graphical-tdx-image.bb
+
+SUMMARY = "Toradex Embedded Linux Reference Multimedia Image"
+DESCRIPTION = "Image for BSP verification with QT and multimedia features"
+
+#Prefix to the resulting deployable tarball name
+export IMAGE_BASENAME = "Reference-Multimedia-Image"
+
+IMAGE_INSTALL += " \
+    packagegroup-tdx-cli \
+    packagegroup-tdx-graphical \
+    \
+    bash \
+    coreutils \
+    less \
+    makedevs \
+    mime-support \
+    util-linux \
+    v4l-utils \
+    \
+    gpicview \
+    media-files \
+"
diff --git a/recipes-images/images/verification-tdx-image.bb b/recipes-images/images/verification-tdx-image.bb
deleted file mode 100644
index 8c1a2a6..0000000
--- a/recipes-images/images/verification-tdx-image.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require graphical-tdx-image.bb
-
-SUMMARY = "Toradex Embedded Linux Verification Image"
-DESCRIPTION = "Image for BSP verification"
-
-#Prefix to the resulting deployable tarball name
-export IMAGE_BASENAME = "Verification-Image"
-
-IMAGE_INSTALL += " \
-    packagegroup-tdx-cli \
-    packagegroup-tdx-graphical \
-    \
-    bash \
-    coreutils \
-    less \
-    makedevs \
-    mime-support \
-    util-linux \
-    v4l-utils \
-    \
-    gpicview \
-    media-files \
-"
-- 
cgit v1.2.3