From 93f9c2b0df6b0e2ca3b5ac1467139c87db31c349 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Apr 2009 08:39:50 +0200 Subject: various image: weakly assign $SPLASH so it isn't unset on expansion --- recipes/images/beagleboard-demo-image.bb | 1 + recipes/images/bootmanager-image.bb | 2 ++ recipes/images/gateway-image.bb | 2 ++ recipes/images/minimal-gpe-image.bb | 1 + recipes/images/minimal-image.bb | 4 +++- recipes/images/sdr-image.bb | 1 + recipes/images/sugar-image.bb | 1 + recipes/images/udumpty-image.bb | 1 + recipes/images/x11-gpe-image.bb | 1 + recipes/images/x11-gpe-java-image.bb | 1 + recipes/images/x11-office-image.bb | 1 + recipes/images/x11-pimlico-image.bb | 1 + 12 files changed, 16 insertions(+), 1 deletion(-) diff --git a/recipes/images/beagleboard-demo-image.bb b/recipes/images/beagleboard-demo-image.bb index 7d0e408b73..441e99383c 100644 --- 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 1f8c3273f6..db0543774e 100644 --- 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 8df21bcbeb..d7a77e0bb8 100644 --- 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 d71f9dee19..c37225d53c 100644 --- 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 0acb5f1ad1..650a3d681c 100644 --- 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 8338a57338..55a59a285d 100644 --- 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 2787f99e00..247927543b 100644 --- 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 e581a8edab..8f616d97f8 100644 --- 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 03c9761663..837d94a11e 100644 --- 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 b8904e303c..760fe52f4d 100644 --- 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 66cc762d93..ecbc8a0d24 100644 --- 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 e16eb51043..cb8e78da5a 100644 --- 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" -- cgit 1.2.3-korg