summaryrefslogtreecommitdiff
path: root/packages/angstrom
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-05-09 05:44:30 +0000
committerRod Whitby <rod@whitby.id.au>2007-05-09 05:44:30 +0000
commitfb1bf22bf1f99bf39062a414dc95b783af24e0eb (patch)
tree9de3ace3c9bb1605e6306e9c2fba8febfcc52ccb /packages/angstrom
parent0af1290e79f6d482be943cadb292c1f3c44c3aab (diff)
parenta1da152a12837b54328d9f6bae672c23815df67c (diff)
merge of '8cf0ade6025c07f6fb2d8dcb863a8e6b345dddaa'
and 'e7a885c65fac678637bdc0153d73dafaa9bb1608'
Diffstat (limited to 'packages/angstrom')
-rw-r--r--packages/angstrom/angstrom-console-image.bb5
-rw-r--r--packages/angstrom/angstrom-x11-image.bb5
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb
index e5a6dcc2a3..5368b0deaa 100644
--- a/packages/angstrom/angstrom-console-image.bb
+++ b/packages/angstrom/angstrom-console-image.bb
@@ -1,12 +1,13 @@
#Angstrom bootstrap image
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
ANGSTROM_EXTRA_INSTALL ?= ""
-DEPENDS = "task-base"
+DEPENDS = "task-base psplash-zap"
RDEPENDS = "task-base \
${ANGSTROM_EXTRA_INSTALL} \
+ psplash-zap \
"
export IMAGE_BASENAME = "console-image"
diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb
index c5d2675b60..14e83818a0 100644
--- a/packages/angstrom/angstrom-x11-image.bb
+++ b/packages/angstrom/angstrom-x11-image.bb
@@ -1,6 +1,6 @@
#Angstrom X11 image
LICENSE = "MIT"
-PR = "r6"
+PR = "r8"
PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
PREFERRED_PROVIDER_tslib ?= "tslib"
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-ANGSTROM_EXTRA_INSTALL ?= ""
+ANGSTROM_EXTRA_INSTALL ?= "hal gstreamer"
XSERVER ?= "xserver-kdrive-fbdev"
export IMAGE_BASENAME = "x11-image"
@@ -17,6 +17,7 @@ DEPENDS = "task-base"
RDEPENDS = "\
${XSERVER} \
task-base \
+ task-base-wifi \
angstrom-x11-base-depends \
angstrom-gpe-task-base \
angstrom-gpe-task-settings \