aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-02-05 12:16:13 +0100
committerKoen Kooi <koen@openembedded.org>2010-02-07 10:10:36 +0100
commitee896efc04d32be2ed5a98ca5e9a59496a675143 (patch)
tree99362bab82a4d7553ac5788cc8ee6f855eca587f
parent642308e3e88390b0b37df3cc15c519aa298276ff (diff)
downloadopenembedded-ee896efc04d32be2ed5a98ca5e9a59496a675143.tar.gz
angstrom-{x,GNOME}-image: move some definitions around, create timestamp
-rw-r--r--recipes/images/angstrom-gnome-image.bb15
-rw-r--r--recipes/images/angstrom-x-image.bb15
2 files changed, 23 insertions, 7 deletions
diff --git a/recipes/images/angstrom-gnome-image.bb b/recipes/images/angstrom-gnome-image.bb
index f3e18b1d75..e15e9947bf 100644
--- a/recipes/images/angstrom-gnome-image.bb
+++ b/recipes/images/angstrom-gnome-image.bb
@@ -2,21 +2,30 @@ DESCRIPTION = "Image based on the GNOME desktop"
inherit image
+XSERVER ?= "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-video-sisusb \
+ xf86-input-keyboard \
+"
+
export IMAGE_BASENAME = "GNOME-image"
IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
ROOTFS_POSTPROCESS_COMMAND += 'install_linguas;'
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
IMAGE_LOGIN_MANAGER = "shadow"
+IMAGE_SPLASH = "exquisite exquisite-themes exquisite-theme-angstrom"
ANGSTROM_EXTRA_INSTALL ?= ""
-SPLASH = "psplash-angstrom"
-
IMAGE_INSTALL += " \
task-base-extended \
${ANGSTROM_EXTRA_INSTALL} \
- ${SPLASH} \
+ ${IMAGE_SPLASH} \
angstrom-task-gnome \
+ bash \
"
diff --git a/recipes/images/angstrom-x-image.bb b/recipes/images/angstrom-x-image.bb
index 3f322fbce2..78422f6f79 100644
--- a/recipes/images/angstrom-x-image.bb
+++ b/recipes/images/angstrom-x-image.bb
@@ -2,27 +2,34 @@ DESCRIPTION = "Image based on the GNOME desktop"
inherit image
-XSERVER ?= ""
+XSERVER ?= "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-video-sisusb \
+ xf86-input-keyboard \
+"
export IMAGE_BASENAME = "X-image"
IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
ROOTFS_POSTPROCESS_COMMAND += 'install_linguas;'
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
IMAGE_LOGIN_MANAGER = "shadow"
+IMAGE_SPLASH = "exquisite exquisite-themes exquisite-theme-angstrom"
ANGSTROM_EXTRA_INSTALL ?= ""
-SPLASH = "psplash-angstrom"
-
IMAGE_INSTALL += " \
task-base-extended \
${ANGSTROM_EXTRA_INSTALL} \
- ${SPLASH} \
+ ${IMAGE_SPLASH} \
${XSERVER} \
angstrom-task-gnome \
openbox \
e-wm-config-angstrom \
task-xfce46-base task-xfce46-extras \
+ bash \
"