diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
| commit | 9d829ed05c295df608b4fc108eb1c628fd06fd39 (patch) | |
| tree | c1b27cfe4498f8abef1a61325922906f3e6a32ff /packages/angstrom/angstrom-x11-image.bb | |
| parent | 1434b204e16e87b7f59f074f3036d5dcbcf0116f (diff) | |
| parent | 6ccac10beeaaa02a86081bd6179fd57c208ad6b1 (diff) | |
merge of '76e1e69496801009ea0aa69c84f76e858978ab99'
and 'db976a98427dd6a195e2cf167e225de2d0206aea'
Diffstat (limited to 'packages/angstrom/angstrom-x11-image.bb')
| -rw-r--r-- | packages/angstrom/angstrom-x11-image.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index dbb986ae65..83f00cce66 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 = "r5" +PR = "r11" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -8,7 +8,9 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -ANGSTROM_EXTRA_INSTALL ?= "" +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-image" @@ -16,8 +18,7 @@ export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ - task-base \ + task-base-extended \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ angstrom-gpe-task-settings \ |