]> git.openpandora.org Git - openembedded.git/commitdiff
console-base-image,console-image,gnuradio-image: readd psplash-zap
authorAndrea Adami <andrea.adami@gmail.com>
Thu, 23 Apr 2009 21:46:21 +0000 (23:46 +0200)
committerAndrea Adami <andrea.adami@gmail.com>
Thu, 23 Apr 2009 21:49:33 +0000 (23:49 +0200)
 - for distros without psplash keep the old behaviour and check 'screen'

recipes/images/console-base-image.bb
recipes/images/console-image.bb
recipes/images/gnuradio-image.bb

index 93391c6776efc7392881db444979f598067a9a3a..d25a4fc79ee0c06c91d3f82521c4faf95a310ba7 100644 (file)
@@ -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
-
index e30793b05f4f4c0bcd4b00ba531c9a18eb67e6d5..97078814025f62967bbf90c7749112903d2a9334 100644 (file)
@@ -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
-
index ce4f4997ebdaf2c25b358c8ec050f868b23304d2..53e79b8a1a5e2639a5b17a2c4a992f6d2f858afb 100644 (file)
@@ -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
-