diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:33:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:33:28 +0000 |
| commit | 6e90aae26efa66553063b74b9afa9563b70fb982 (patch) | |
| tree | dc0273068963d8e57f48f75875e5236153cf1cd9 /packages/tasks | |
| parent | 496d5415774f03b6e09aee17763ac9432d9c2755 (diff) | |
| parent | 62007cb1fac3e5a7f4a09b61c7d3c3b7cd5fc8a7 (diff) | |
merge of '55c714e37be4606a4166b3df883d5f404d3889bf'
and 'd714000fc8a6b75093a93f01782724b65d31eac1'
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-boot.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko-feed.bb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 40c5bd530b..fb09ad1a83 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r40" +PR = "r41" inherit task @@ -40,6 +40,7 @@ RDEPENDS_task-boot = "\ base-passwd \ busybox \ initscripts \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \ update-alternatives \ diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 84a37afe1d..1c97a355f1 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r14" +PR = "r15" inherit task @@ -16,6 +16,7 @@ RDEPENDS_task-openmoko-feed = "\ ipkg-link ipkg-utils \ joe \ kbdd \ + kexec-tools \ midori \ mplayer \ mtpaint \ |