[oe-commits] Andrea Adami : console-base-image, console-image, gnuradio-image: readd psplash-zap

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f822ec3f5a0820addc1025a132ae27fa43b11c9f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f822ec3f5a0820addc1025a132ae27fa43b11c9f

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Thu Apr 23 23:46:21 2009 +0200

console-base-image,console-image,gnuradio-image: readd psplash-zap
 - for distros without psplash keep the old behaviour and check 'screen'

---

 recipes/images/console-base-image.bb |    8 +++++---
 recipes/images/console-image.bb      |    8 +++++---
 recipes/images/gnuradio-image.bb     |    8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb
index 93391c6..d25a4fc 100644
--- a/recipes/images/console-base-image.bb
+++ b/recipes/images/console-base-image.bb
@@ -4,18 +4,20 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+SPLASH ?= ""
+ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
 DEPENDS = "task-base \
            ${SPLASH} \
+           ${ZZAPSPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	    ${SPLASH} \
-	   "
+	    ${ZZAPSPLASH} \
+	    "
 
 IMAGE_LINGUAS = ""
 
 inherit image
-
diff --git a/recipes/images/console-image.bb b/recipes/images/console-image.bb
index e30793b..9707881 100644
--- a/recipes/images/console-image.bb
+++ b/recipes/images/console-image.bb
@@ -4,19 +4,21 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+SPLASH ?= ""
+ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
 DEPENDS = "task-base-extended \
            ${SPLASH} \
+           ${ZZAPSPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base-extended \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	    ${SPLASH} \
-	   "
+	    ${ZZAPSPLASH} \
+	    "
 
 export IMAGE_BASENAME = "console-image"
 IMAGE_LINGUAS = ""
 
 inherit image
-
diff --git a/recipes/images/gnuradio-image.bb b/recipes/images/gnuradio-image.bb
index ce4f499..53e79b8 100644
--- a/recipes/images/gnuradio-image.bb
+++ b/recipes/images/gnuradio-image.bb
@@ -4,25 +4,27 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 IMAGE_EXTRA_INSTALL ?= ""
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+SPLASH ?= ""
+ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
 DEPENDS = "task-base-extended \
            ${SPLASH} \
+           ${ZZAPSPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base-extended \
 	    ${IMAGE_EXTRA_INSTALL} \
 	    ${SPLASH} \
+	    ${ZZAPSPLASH} \
             oprofile \
             screen \
             ntp ntp-bin \
             make \
             nfs-utils-client \
             gnuradio gnuradio-examples \
-	   "
+	    "
 
 export IMAGE_BASENAME = "gnuradio-image"
 IMAGE_LINGUAS = ""
 
 inherit image
-