aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-06-09 11:33:52 +0200
committerKoen Kooi <koen@openembedded.org>2009-06-09 11:33:52 +0200
commitac616998929791a6ed3886c5df8b90971cdf0498 (patch)
tree06307bf75a6e5e38cdb935fc54e3db0e47c623b9
parentb2aafb0e06d8c5b065d74b60fd395497ec4c85ae (diff)
parentfe2491f8bdcd9b3fc5fc9b3479cb731f2beb625f (diff)
downloadopenembedded-ac616998929791a6ed3886c5df8b90971cdf0498.tar.gz
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
-rw-r--r--conf/distro/kaeilos.conf4
1 files changed, 3 insertions, 1 deletions
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"