minimal: Quoting fixups, always set virtual/psplash to what we would want.
authorTom Rini <tom_rini@mentor.com>
Sat, 1 May 2010 20:28:46 +0000 (13:28 -0700)
committerTom Rini <tom_rini@mentor.com>
Sat, 1 May 2010 20:30:32 +0000 (13:30 -0700)
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>
conf/distro/minimal.conf

index 7aa6c58..f42f1b6 100644 (file)
@@ -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"