[oe-commits] Andrea Adami : console-base-image, console-image, gnuradio-image: don' t hardcode psplash-zap

[GIT User account]

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

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Wed Apr 22 23:26:41 2009 +0200

console-base-image,console-image,gnuradio-image: don't hardcode psplash-zap

---

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

diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb
index 887d37b..93391c6 100644
--- a/recipes/images/console-base-image.bb
+++ b/recipes/images/console-base-image.bb
@@ -4,13 +4,15 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+
 DEPENDS = "task-base \
-           ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+           ${SPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base \
 	    ${ANGSTROM_EXTRA_INSTALL} \
-	    ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+	    ${SPLASH} \
 	   "
 
 IMAGE_LINGUAS = ""
diff --git a/recipes/images/console-image.bb b/recipes/images/console-image.bb
index 76cb8f0..e30793b 100644
--- a/recipes/images/console-image.bb
+++ b/recipes/images/console-image.bb
@@ -4,13 +4,15 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+
 DEPENDS = "task-base-extended \
-           ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+           ${SPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base-extended \
 	    ${ANGSTROM_EXTRA_INSTALL} \
-	    ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+	    ${SPLASH} \
 	   "
 
 export IMAGE_BASENAME = "console-image"
diff --git a/recipes/images/gnuradio-image.bb b/recipes/images/gnuradio-image.bb
index 5421584..ce4f499 100644
--- a/recipes/images/gnuradio-image.bb
+++ b/recipes/images/gnuradio-image.bb
@@ -4,13 +4,15 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 IMAGE_EXTRA_INSTALL ?= ""
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
+
 DEPENDS = "task-base-extended \
-           ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+           ${SPLASH} \
 	   "
 
 IMAGE_INSTALL = "task-base-extended \
 	    ${IMAGE_EXTRA_INSTALL} \
-	    ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+	    ${SPLASH} \
             oprofile \
             screen \
             ntp ntp-bin \