]> git.openpandora.org Git - openembedded.git/commitdiff
console-base-image,console-image,gnuradio-image: don't hardcode psplash-zap
authorAndrea Adami <andrea.adami@gmail.com>
Wed, 22 Apr 2009 21:26:41 +0000 (23:26 +0200)
committerAndrea Adami <andrea.adami@gmail.com>
Wed, 22 Apr 2009 21:40:19 +0000 (23:40 +0200)
recipes/images/console-base-image.bb
recipes/images/console-image.bb
recipes/images/gnuradio-image.bb

index 887d37bdd9aa164e9481bed15fff92ebb2bad6c9..93391c6776efc7392881db444979f598067a9a3a 100644 (file)
@@ -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 = ""
index 76cb8f034ed5aabb2261e6d1cc627b5ebfbe4c6e..e30793b05f4f4c0bcd4b00ba531c9a18eb67e6d5 100644 (file)
@@ -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"
index 54215844814dae466535d9f6c95a890cfd412c80..ce4f4997ebdaf2c25b358c8ec050f868b23304d2 100644 (file)
@@ -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 \