summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/image.bbclass3
-rw-r--r--recipes/images/console-base-image.bb1
-rw-r--r--recipes/images/gnuradio-image.bb1
-rw-r--r--recipes/images/minimal-image.bb2
4 files changed, 3 insertions, 4 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index ab580312bb..9dce609733 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -17,6 +17,9 @@ IMAGE_INITSCRIPTS ?= "initscripts"
#
IMAGE_LOGIN_MANAGER ?= "tinylogin"
+# set sane default for the SPLASH variable
+SPLASH ?= ""
+
IMAGE_KEEPROOTFS ?= ""
IMAGE_KEEPROOTFS[doc] = "Set to non-empty to keep ${IMAGE_ROOTFS} around after image creation."
diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb
index d25a4fc79e..9bd50316b5 100644
--- a/recipes/images/console-base-image.bb
+++ b/recipes/images/console-base-image.bb
@@ -4,7 +4,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
ANGSTROM_EXTRA_INSTALL ?= ""
-SPLASH ?= ""
ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
DEPENDS = "task-base \
diff --git a/recipes/images/gnuradio-image.bb b/recipes/images/gnuradio-image.bb
index 53e79b8a1a..6bccda0a24 100644
--- a/recipes/images/gnuradio-image.bb
+++ b/recipes/images/gnuradio-image.bb
@@ -4,7 +4,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
IMAGE_EXTRA_INSTALL ?= ""
-SPLASH ?= ""
ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
DEPENDS = "task-base-extended \
diff --git a/recipes/images/minimal-image.bb b/recipes/images/minimal-image.bb
index e9abcb35ca..0bd8019df0 100644
--- a/recipes/images/minimal-image.bb
+++ b/recipes/images/minimal-image.bb
@@ -4,8 +4,6 @@
ANGSTROM_EXTRA_INSTALL ?= ""
DISTRO_SSH_DAEMON ?= "dropbear"
-SPLASH ?= " "
-
IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
IMAGE_INSTALL = "task-boot \