From: Andrea Adami <andrea.adami@gmail.com>
Date: Wed, 22 Apr 2009 21:26:41 +0000 (+0200)
Subject: console-base-image,console-image,gnuradio-image: don't hardcode psplash-zap
X-Git-Tag: Release-2010-05/1~3701^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a36b908f19f0511e66dde773cc6ef359c450a2e;p=openembedded.git

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

diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb
index 887d37bdd9..93391c6776 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 76cb8f034e..e30793b05f 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 5421584481..ce4f4997eb 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 \