summaryrefslogtreecommitdiff
path: root/classes/image.bbclass
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-14 20:39:47 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-14 20:39:47 +0100
commit3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch)
tree995f4a15764d4196a92ecd966150e38d910d57d1 /classes/image.bbclass
parentb5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff)
parente426517ed76c7532434f0687f88fca1295530000 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts: recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'classes/image.bbclass')
-rw-r--r--classes/image.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index ab580312bb..9dce609733 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -17,6 +17,9 @@ IMAGE_INITSCRIPTS ?= "initscripts"
#
IMAGE_LOGIN_MANAGER ?= "tinylogin"
+# set sane default for the SPLASH variable
+SPLASH ?= ""
+
IMAGE_KEEPROOTFS ?= ""
IMAGE_KEEPROOTFS[doc] = "Set to non-empty to keep ${IMAGE_ROOTFS} around after image creation."