From 1188498a4bbdb747ba9d97af788d6fd85cf93ea3 Mon Sep 17 00:00:00 2001
From: Tobias Poganiuch <tobias.poganiuch@garz-fricke.com>
Date: Fri, 13 May 2022 15:05:25 +0200
Subject: [PATCH] images: Renamed images to seconorth
Images have been renamed to seconorth.
Additionally, some clean-up and commenting has been done.
---
recipes-bsp/images/fngsystem-image.bb | 11 ++---
recipes-bsp/images/guf-image-extra.bb | 13 ------
recipes-bsp/images/seconorth-image-extra.bb | 14 +++++++
...-minimal.bb => seconorth-image-minimal.bb} | 8 ++--
...mage-small.bb => seconorth-image-small.bb} | 20 +++++----
.../{guf-image.bb => seconorth-image.bb} | 41 ++++++++++---------
.../{guf-image.inc => seconorth-image.inc} | 6 ++-
7 files changed, 62 insertions(+), 51 deletions(-)
delete mode 100644 recipes-bsp/images/guf-image-extra.bb
create mode 100644 recipes-bsp/images/seconorth-image-extra.bb
rename recipes-bsp/images/{guf-image-minimal.bb => seconorth-image-minimal.bb} (64%)
rename recipes-bsp/images/{guf-image-small.bb => seconorth-image-small.bb} (66%)
rename recipes-bsp/images/{guf-image.bb => seconorth-image.bb} (55%)
rename recipes-bsp/images/{guf-image.inc => seconorth-image.inc} (69%)
diff --git a/recipes-bsp/images/fngsystem-image.bb b/recipes-bsp/images/fngsystem-image.bb
index c4911a9b..cbee0d08 100644
--- a/recipes-bsp/images/fngsystem-image.bb
+++ b/recipes-bsp/images/fngsystem-image.bb
@@ -1,7 +1,8 @@
SUMMARY ??= "SECO Northern Europe Flash 'N' Go ${PN}"
+HOMEPAGE = "https://www.seco.com"
+
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-HOMEPAGE = "https://www.seco.com"
inherit core-image features_check on_bootloader
@@ -23,9 +24,9 @@ REMOVED_FOR_NOW = " \
cgetty \
cmd-line-env \
glibc-ld-linux-compatibility \
- packagegroup-guf-graphics-fw \
- packagegroup-guf-kernel-modules \
- packagegroup-guf-wireless-fw \
+ packagegroup-seconorth-graphics-fw \
+ packagegroup-seconorth-kernel-modules \
+ packagegroup-seconorth-wireless-fw \
util-linux-2.25-sfdisk \
xxd \
"
@@ -59,7 +60,7 @@ IMAGE_INSTALL_FNG = " \
nano \
openssl \
os-release \
- packagegroup-guf-productiontests \
+ packagegroup-seconorth-productiontests \
parted \
rtl8723ds \
rtl8723ds-bt-uart-driver \
diff --git a/recipes-bsp/images/guf-image-extra.bb b/recipes-bsp/images/guf-image-extra.bb
deleted file mode 100644
index 1ec6eb9a..00000000
--- a/recipes-bsp/images/guf-image-extra.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "The standard SECO North Yocto Image with some extras"
-
-require guf-image.bb
-
-IMAGE_INSTALL_MULTIMEDIA += " \
- packagegroup-guf-multimedia-tests \
- packagegroup-guf-multimedia-extra \
-"
-
-IMAGE_INSTALL_QT += " \
- packagegroup-guf-qt5-examples \
-"
-
diff --git a/recipes-bsp/images/seconorth-image-extra.bb b/recipes-bsp/images/seconorth-image-extra.bb
new file mode 100644
index 00000000..3bcda0ca
--- /dev/null
+++ b/recipes-bsp/images/seconorth-image-extra.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "The SECO Northern Europe Yocto Image with additional Features. \
+It contains the base system plus Wayland, Qt5 and Examples."
+
+require seconorth-image.bb
+
+IMAGE_INSTALL_MULTIMEDIA += " \
+ packagegroup-seconorth-multimedia-extra \
+ packagegroup-seconorth-multimedia-tests \
+"
+
+IMAGE_INSTALL_QT += " \
+ packagegroup-seconorth-qt5-examples \
+"
+
diff --git a/recipes-bsp/images/guf-image-minimal.bb b/recipes-bsp/images/seconorth-image-minimal.bb
similarity index 64%
rename from recipes-bsp/images/guf-image-minimal.bb
rename to recipes-bsp/images/seconorth-image-minimal.bb
index 9f0f3d0f..6dea3c10 100644
--- a/recipes-bsp/images/guf-image-minimal.bb
+++ b/recipes-bsp/images/seconorth-image-minimal.bb
@@ -1,6 +1,7 @@
-SUMMARY = "A minimal SECO North Yocto Image"
+DESCRIPTION = "A minimal Image for the SECO Northern Europe boards. \
+It contains only the minimal base system."
-include guf-image.inc
+require seconorth-image.inc
# ----------------------------------------------
# The following packages are included implicitly
@@ -15,9 +16,10 @@ IMAGE_FEATURES += " \
"
CORE_IMAGE_EXTRA_INSTALL += " \
- packagegroup-guf-minimal \
+ packagegroup-seconorth-minimal \
"
+# @TODO: Should we rename the user to seco?
EXTRA_USERS_PARAMS = " \
useradd guf; \
"
diff --git a/recipes-bsp/images/guf-image-small.bb b/recipes-bsp/images/seconorth-image-small.bb
similarity index 66%
rename from recipes-bsp/images/guf-image-small.bb
rename to recipes-bsp/images/seconorth-image-small.bb
index 59125a67..9e5d59cd 100644
--- a/recipes-bsp/images/guf-image-small.bb
+++ b/recipes-bsp/images/seconorth-image-small.bb
@@ -1,6 +1,7 @@
-SUMMARY = "A small SECO North Yocto Image"
+DESCRIPTION = "The SECO Northern Europe Yocto Image with reduced Features. \
+It contains the base system and Wayland but doesn't come with Qt5."
-include guf-image.inc
+require seconorth-image.inc
inherit features_check
@@ -25,34 +26,35 @@ IMAGE_FEATURES += " \
IMAGE_INSTALL_GRAPHICS += " \
"
-IMAGE_INSTALL_GUF += " \
- packagegroup-guf-small \
+IMAGE_INSTALL_SECONORTH += " \
+ packagegroup-seconorth-small \
"
IMAGE_INSTALL_MULTIMEDIA += " \
- packagegroup-guf-multimedia \
+ packagegroup-seconorth-multimedia \
"
IMAGE_INSTALL_QT += " \
"
IMAGE_INSTALL_TEST += " \
- packagegroup-guf-tests \
+ packagegroup-seconorth-tests \
"
IMAGE_INSTALL_CONNECTIVITY += " \
- packagegroup-guf-connectivity \
+ packagegroup-seconorth-connectivity \
"
CORE_IMAGE_EXTRA_INSTALL += " \
+ ${IMAGE_INSTALL_CONNECTIVITY} \
${IMAGE_INSTALL_GRAPHICS} \
- ${IMAGE_INSTALL_GUF} \
+ ${IMAGE_INSTALL_SECONORTH} \
${IMAGE_INSTALL_MULTIMEDIA} \
${IMAGE_INSTALL_QT} \
${IMAGE_INSTALL_TEST} \
- ${IMAGE_INSTALL_CONNECTIVITY} \
"
+# @TODO: Should we rename the user to seco?
EXTRA_USERS_PARAMS = " \
useradd guf; \
"
diff --git a/recipes-bsp/images/guf-image.bb b/recipes-bsp/images/seconorth-image.bb
similarity index 55%
rename from recipes-bsp/images/guf-image.bb
rename to recipes-bsp/images/seconorth-image.bb
index 4b7392f9..3d2e973f 100644
--- a/recipes-bsp/images/guf-image.bb
+++ b/recipes-bsp/images/seconorth-image.bb
@@ -1,6 +1,8 @@
-SUMMARY = "The standard SECO North Yocto Image"
+DESCRIPTION = "The SECO Northern Europe Standard Yocto Image. \
+It contains the base system plus Wayland and Qt5."
+
+require seconorth-image.inc
-require guf-image.inc
inherit populate_sdk_qt5 features_check
REQUIRED_DISTRO_FEATURES = "wayland"
@@ -22,53 +24,54 @@ IMAGE_FEATURES += " \
"
IMAGE_INSTALL_GRAPHICS += " \
- packagegroup-guf-graphics-wayland \
- packagegroup-guf-graphics-fonts \
+ packagegroup-seconorth-graphics-fonts \
+ packagegroup-seconorth-graphics-wayland \
"
-IMAGE_INSTALL_GUF += " \
+IMAGE_INSTALL_SECONORTH += " \
guf-show-demo \
- packagegroup-guf-small \
- packagegroup-guf-debug \
+ packagegroup-seconorth-debug \
+ packagegroup-seconorth-small \
"
-IMAGE_INSTALL_GUF:imx8mpguf += " \
+IMAGE_INSTALL_SECONORTH:imx8mpguf += " \
guf-show-demo2 \
"
IMAGE_INSTALL_MULTIMEDIA += " \
- packagegroup-guf-multimedia \
+ packagegroup-seconorth-multimedia \
"
IMAGE_INSTALL_QT += " \
- packagegroup-guf-qt5 \
- packagegroup-guf-qt5-tools \
- packagegroup-guf-qt5-tests \
- packagegroup-guf-qt5-translations \
+ packagegroup-seconorth-qt5 \
+ packagegroup-seconorth-qt5-tests \
+ packagegroup-seconorth-qt5-tools \
+ packagegroup-seconorth-qt5-translations \
"
IMAGE_INSTALL_PYTHON += " \
- packagegroup-guf-python \
+ packagegroup-seconorth-python \
"
IMAGE_INSTALL_TEST += " \
- packagegroup-guf-tests-full \
+ packagegroup-seconorth-tests-full \
"
IMAGE_INSTALL_CONNECTIVITY += " \
- packagegroup-guf-connectivity \
+ packagegroup-seconorth-connectivity \
"
CORE_IMAGE_EXTRA_INSTALL += " \
+ ${IMAGE_INSTALL_CONNECTIVITY} \
${IMAGE_INSTALL_GRAPHICS} \
- ${IMAGE_INSTALL_GUF} \
${IMAGE_INSTALL_MULTIMEDIA} \
- ${IMAGE_INSTALL_QT} \
${IMAGE_INSTALL_PYTHON} \
+ ${IMAGE_INSTALL_QT} \
+ ${IMAGE_INSTALL_SECONORTH} \
${IMAGE_INSTALL_TEST} \
- ${IMAGE_INSTALL_CONNECTIVITY} \
"
+# @TODO: Should we rename the user to seco?
EXTRA_USERS_PARAMS = " \
useradd guf; \
"
diff --git a/recipes-bsp/images/guf-image.inc b/recipes-bsp/images/seconorth-image.inc
similarity index 69%
rename from recipes-bsp/images/guf-image.inc
rename to recipes-bsp/images/seconorth-image.inc
index db5f85c0..86cae74b 100644
--- a/recipes-bsp/images/guf-image.inc
+++ b/recipes-bsp/images/seconorth-image.inc
@@ -1,9 +1,11 @@
-# Common definitions for guf-image recipes
+# Common Definitions for SECO Northern Europe Images
+SUMMARY = "SECO Northern Europe Yocto Image"
+HOMEPAGE = "https://www.seco.com"
+
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
-HOMEPAGE = "https://www.seco.com"
inherit core-image extrausers
--
GitLab