summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-unit-core/dynamic-layers/raspberrypi/recipes-unit/images/core-image-unit.bbappend1
-rw-r--r--meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend5
-rw-r--r--meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-boot-splash.bb5
-rw-r--r--meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-splash.bb1
4 files changed, 9 insertions, 3 deletions
diff --git a/meta-unit-core/dynamic-layers/raspberrypi/recipes-unit/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/raspberrypi/recipes-unit/images/core-image-unit.bbappend
new file mode 100644
index 0000000..8b91da8
--- /dev/null
+++ b/meta-unit-core/dynamic-layers/raspberrypi/recipes-unit/images/core-image-unit.bbappend
@@ -0,0 +1 @@
+IMAGE_FEATURES:append:raspberrypi3-64 = " boot-splash"
diff --git a/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
index 5cedc57..9776077 100644
--- a/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
+++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
@@ -4,6 +4,7 @@ inherit mask-tty1-getty
IMAGE_FEATURES:append = " hwcodecs"
IMAGE_INSTALL:append = " packagegroup-unit-kiosk"
-IMAGE_INSTALL:append = " packagegroup-unit-splash"
+IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'splash', 'packagegroup-unit-splash', '', d)}"
+IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'boot-splash', 'packagegroup-unit-boot-splash', '', d)}"
-IMAGE_BOOT_FILES:append = " yocto_project_logo_white_800x480_24bpp.bmp.gz"
+IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'boot-splash', 'yocto_project_logo_white_800x480_24bpp.bmp.gz', '', d)}"
diff --git a/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-boot-splash.bb b/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-boot-splash.bb
new file mode 100644
index 0000000..2b39ed2
--- /dev/null
+++ b/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-boot-splash.bb
@@ -0,0 +1,5 @@
+SUMMARY = "Unit boot splash"
+
+inherit packagegroup
+
+RDEPENDS:${PN}:append = " u-boot-splash"
diff --git a/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-splash.bb b/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-splash.bb
index 833cb21..e01b4dc 100644
--- a/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-splash.bb
+++ b/meta-unit-graphics/recipes-core/packagegroups/packagegroup-unit-splash.bb
@@ -2,5 +2,4 @@ SUMMARY = "Unit kiosk"
inherit packagegroup
-RDEPENDS:${PN}:append = " u-boot-splash"
RDEPENDS:${PN}:append = " plymouth-quit-conf"