From: Alessandro GARDICH <gremlin@gremlin.it>
Date: Tue, 26 May 2009 10:14:46 +0000 (+0000)
Subject: kaeilos.conf and SPLASH
X-Git-Tag: Release-2010-05/1~3209^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe2491f8bdcd9b3fc5fc9b3479cb731f2beb625f;p=openembedded.git

kaeilos.conf and SPLASH

Hi

Make kaeilos.conf be aware of the new SPASH variable used in images recipes.

At least it make bitbake start work, as soon as build the x11-image I'll
check if also the image is working proper

Alessandro
Acked-by: Marco Cavallini  <m.cavallini@koansoftware.com>
---

diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 718239bed8..6d01c773ce 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -209,12 +209,12 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps"
 # contains ipkg specific stuff as well :(
 DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
-    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     kaeilos-version \
     opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-ng-mount util-linux-ng-umount \
     ${DEBUG_APPS} angstrom-libc-fixup-hack \
     "
+#   ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
 
 # This also hooks into task-base, but isn't mandatory.
 # If you don't want parts of this in your task-base using images you can put this in the image recipe:
@@ -233,5 +233,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     openssh-sftp-server \
     "
 
+SPLASH ?= "psplash"
+
 ARM_INSTRUCTION_SET_pn-uclibc = "arm"
 ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"