diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-29 16:13:29 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-29 16:13:29 +0000 |
commit | 339144112d488d42d84fe5e1d91ba20bde769f76 (patch) | |
tree | 7875c8c21e291d8d1bb96b50394480ef6f1f2c10 /packages/tasks | |
parent | 69c3a4e292aabe37e7ae28bb521462a1619a3fa2 (diff) | |
parent | d9ce834542de0a4225a52b3c129082468d3cfa79 (diff) |
merge of '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
and '9d51ade6b4318612931d9e49436a802f6c1fa43f'
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 \ " |