various image: weakly assign $SPLASH so it isn't unset on expansion

diff --git a/recipes/images/beagleboard-demo-image.bb b/recipes/images/beagleboard-demo-image.bb
index 7d0e408b7360d05aac41322870b9e7d3ce8ac897..441e99383c2edf68d9de2dfaca03cdf02f9466fa 100644 (file)
--- a/recipes/images/beagleboard-demo-image.bb
+++ b/recipes/images/beagleboard-demo-image.bb
@@ -10,6 +10,7 @@ XSERVER ?= "xserver-xorg \
 "
 
 ANGSTROM_EXTRA_INSTALL ?= ""
+SPLASH = "exquisite exquisite-themes exquisite-theme-angstrom"
 
 export IMAGE_BASENAME = "Beagleboard-demo-image"
 

diff --git a/recipes/images/bootmanager-image.bb b/recipes/images/bootmanager-image.bb
index 1f8c3273f672e5b707bbd5fb7b6f30e197fa66c9..db0543774e5094334ae94676ebcbc427500a7f8f 100644 (file)
--- a/recipes/images/bootmanager-image.bb
+++ b/recipes/images/bootmanager-image.bb
@@ -1,5 +1,7 @@
 #Angstrom bootmanager image
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+
 DEPENDS = "task-angstrom"
 IMAGE_INSTALL = "angstrom-base-depends angstrom-bootmanager ${SPLASH}"
 

diff --git a/recipes/images/gateway-image.bb b/recipes/images/gateway-image.bb
index 8df21bcbeb854904c8b57bcd4392bcf5fe9a29c9..d7a77e0bb88fa0298d0b9bfc5dede04f8bea855b 100644 (file)
--- a/recipes/images/gateway-image.bb
+++ b/recipes/images/gateway-image.bb
@@ -1,6 +1,8 @@
 #Angstrom gateway image
 #gives you a gateway with SMB, ssh and dnsmasqs
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
 

diff --git a/recipes/images/minimal-gpe-image.bb b/recipes/images/minimal-gpe-image.bb
index d71f9dee19a23a138351bef3e537e14c9a3f739e..c37225d53cca771d3772a3a9678abb295c08d332 100644 (file)
--- a/recipes/images/minimal-gpe-image.bb
+++ b/recipes/images/minimal-gpe-image.bb
@@ -3,6 +3,7 @@
 # Very angstrom and opkg centric
 
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 export IMAGE_BASENAME = "minimalist-gpe-image"
 

diff --git a/recipes/images/minimal-image.bb b/recipes/images/minimal-image.bb
index 0acb5f1ad181946c2522ff98f45f33b143767411..650a3d681c91edd6a9eb45a0303a43fbfc6c367d 100644 (file)
--- a/recipes/images/minimal-image.bb
+++ b/recipes/images/minimal-image.bb
@@ -1,9 +1,11 @@
 #Angstrom minimalist image
-#gives you a small images with ssh access
+#gives you a small image with ssh access
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
 
+SPLASH ?= " "
+
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 IMAGE_INSTALL = "task-boot \

diff --git a/recipes/images/sdr-image.bb b/recipes/images/sdr-image.bb
index 8338a573388e63967382795589a37472a638a3a4..55a59a285d352f886faf1698659f9382f89977a7 100644 (file)
--- a/recipes/images/sdr-image.bb
+++ b/recipes/images/sdr-image.bb
@@ -15,6 +15,7 @@ IMAGE_FSTYPES += "tar.bz2"
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 # Install "big" X if the target has a screen
 GUIPACKAGES_BIGX = " \

diff --git a/recipes/images/sugar-image.bb b/recipes/images/sugar-image.bb
index 2787f99e00e5c728666bc7f951adfb4feb2dd9db..247927543b59b6b4b4bf27a57d3b15bc0582d3ec 100644 (file)
--- a/recipes/images/sugar-image.bb
+++ b/recipes/images/sugar-image.bb
@@ -1,4 +1,5 @@
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 export IMAGE_BASENAME = "sugar-image"
 

diff --git a/recipes/images/udumpty-image.bb b/recipes/images/udumpty-image.bb
index e581a8edab897396273223914872a87ca2c74ded..8f616d97f803eabf4adbfafe157cdb3ffc6d26b0 100644 (file)
--- a/recipes/images/udumpty-image.bb
+++ b/recipes/images/udumpty-image.bb
@@ -1,5 +1,6 @@
 # Image that mimics the default desktop of a certain distro
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 XSERVER ?= "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \

diff --git a/recipes/images/x11-gpe-image.bb b/recipes/images/x11-gpe-image.bb
index 03c9761663508a87ceddea9fee76df174a11aee7..837d94a11eadcc383d7ee1121387a1fdd9dc4aae 100644 (file)
--- a/recipes/images/x11-gpe-image.bb
+++ b/recipes/images/x11-gpe-image.bb
@@ -3,6 +3,7 @@
 ANGSTROM_EXTRA_INSTALL += " \
                          " 
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 export IMAGE_BASENAME = "x11-gpe-image"
 

diff --git a/recipes/images/x11-gpe-java-image.bb b/recipes/images/x11-gpe-java-image.bb
index b8904e303c0b40f194691e188158cd1b5c1f3b97..760fe52f4d0689cbed59f655ce7beba667cbf260 100644 (file)
--- a/recipes/images/x11-gpe-java-image.bb
+++ b/recipes/images/x11-gpe-java-image.bb
@@ -3,6 +3,7 @@
 ANGSTROM_EXTRA_INSTALL += " \
                          " 
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 export IMAGE_BASENAME = "x11-gpe-java-image"
 

diff --git a/recipes/images/x11-office-image.bb b/recipes/images/x11-office-image.bb
index 66cc762d93f9c83cbbafd287b14f7b66a3ddd685..ecbc8a0d24dd3835268ef269b94c95036ca764c6 100644 (file)
--- a/recipes/images/x11-office-image.bb
+++ b/recipes/images/x11-office-image.bb
@@ -3,6 +3,7 @@
 ANGSTROM_EXTRA_INSTALL += " \
                          " 
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 export IMAGE_BASENAME = "x11-office-image"
 

diff --git a/recipes/images/x11-pimlico-image.bb b/recipes/images/x11-pimlico-image.bb
index e16eb510437becfef4fca4da4329b798ec244c5d..cb8e78da5a37ea75ebf149fe133c5fff8f47d494 100644 (file)
--- a/recipes/images/x11-pimlico-image.bb
+++ b/recipes/images/x11-pimlico-image.bb
@@ -3,6 +3,7 @@
 ANGSTROM_EXTRA_INSTALL += " \
                          " 
 XSERVER ?= "xserver-kdrive-fbdev"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 export IMAGE_BASENAME = "x11-pimlico-image"