aboutsummaryrefslogtreecommitdiffstats
path: root/conf/distro
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2010-05-01 13:28:46 -0700
committerTom Rini <tom_rini@mentor.com>2010-05-01 13:30:32 -0700
commit17768e64cc5c066a49a00f72cc33db03a06ad137 (patch)
treeb559b278169d7f90ffe975b0abd7d440806a512f /conf/distro
parent9745a0c17cfa863cb1e17d8468d382d8b567533a (diff)
downloadopenembedded-17768e64cc5c066a49a00f72cc33db03a06ad137.tar.gz
minimal: Quoting fixups, always set virtual/psplash to what we would want.
virtual/psplash is now always being set by compatibility-providers.conf so we want to always override it. Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/minimal.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 7aa6c587ce..f42f1b6758 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -16,7 +16,7 @@ DISTRO_VERSION = "dev-snapshot-${SRCDATE}"
DISTRO_TYPE ?= "debug"
# Ensure some form of release config, so error out if someone thinks he knows better
-DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
+DISTRO_CHECK := "${@bb.data.getVar('DISTRO_VERSION',d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
#############################################################################
# FEATURE SELECTION
@@ -69,7 +69,8 @@ IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-$
CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
-SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}"
+SPLASH ?= '${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}'
+PREFERRED_PROVIDER_virtual/psplash = "psplash"
# increase inode/block ratio for ext2 filesystem
EXTRA_IMAGECMD_ext2 = "-i 8192"