diff options
author | Koen Kooi <koen@openembedded.org> | 2008-03-01 08:52:11 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2008-03-01 08:52:11 +0000 |
commit | 5001a8e2e32fb491f8c0fb2acb0c085636c4ee32 (patch) | |
tree | a11001e8754723793bd67adb6a0423c242ff1b40 /packages/tasks | |
parent | 6ea7f59d1afd33c78c3f3542b3f3e419dbb65127 (diff) | |
parent | 6b473161fd02ea1a5d9bc3006738b8307f2eca01 (diff) |
merge of 'dee683d3de0616c362d03b01a6bf3caa2da5423c'
and 'ee048875cfe4eb10e9fae21dc07aaa545d4f29fc'
Diffstat (limited to 'packages/tasks')
-rw-r--r-- | packages/tasks/task-base.bb | 2 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-base.bb | 9 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-phone.bb | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 77aa07de00..15835508aa 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r62" +PR = "r63" inherit task diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb index a5d13e7e08..310d3f07c3 100644 --- a/packages/tasks/task-openmoko-base.bb +++ b/packages/tasks/task-openmoko-base.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -12,10 +12,11 @@ DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, App RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ - matchbox-keyboard-inputmethod \ - matchbox-keyboard-im \ - matchbox-keyboard-applet \ +# matchbox-keyboard-inputmethod \ +# matchbox-keyboard-im \ +# matchbox-keyboard-applet \ matchbox-stroke \ + multitap-pad \ openmoko-terminal2 \ # openmoko-keyboard \ openmoko-panel-battery \ diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb index 49e4e66859..474efff79d 100644 --- a/packages/tasks/task-openmoko-phone.bb +++ b/packages/tasks/task-openmoko-phone.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r72" +PR = "r73" inherit task @@ -14,5 +14,6 @@ RDEPENDS_task-openmoko-phone = "\ libgsmd-tools \ openmoko-dialer2 \ openmoko-panel-gsm \ + openmoko-panel-memory \ # ppp \ " |