diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 16:19:05 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 16:19:05 +0100 |
| commit | 4cf709283530b333f18ca3530241dd0b73241b1f (patch) | |
| tree | 7f3b125c3485041c0488adf60390a1fdb230bf6c | |
| parent | ce5b19f9784561fb506bc564082e7a3d888a0c90 (diff) | |
| parent | 9eaf1493b3c777d688ad992b9ecedd1cc18cf147 (diff) | |
| download | openembedded-4cf709283530b333f18ca3530241dd0b73241b1f.tar.gz | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Conflicts:
packages/tasks/task-openmoko-feed.bb
| -rw-r--r-- | packages/tasks/task-openmoko-feed.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index ab11f61f81..3b02d4936c 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 = "r54" +PR = "r55" inherit task @@ -66,7 +66,6 @@ RDEPENDS_task-openmoko-feed = "\ tangogps \ pyefl-sudoku \ minicom \ - vim \ iotop \ evince \ epdfview \ @@ -110,10 +109,9 @@ RDEPENDS_task-openmoko-feed = "\ iproute2 \ iputils \ psmisc \ - tar \ - coreutils \ debianutils \ tcptraceroute \ + task-proper-tools \ # dnsutils/bind-tools for dig, nslookup is still missing \ font-adobe-100dpi \ font-adobe-75dpi \ |