summaryrefslogtreecommitdiff
path: root/packages/tasks
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-11-03 16:35:01 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-11-03 16:35:01 +0100
commitf0573933b8de671b98e3d5377774c6a3e671fc84 (patch)
tree10d157bc9803d165bbed7380c806a759a32d5a78 /packages/tasks
parentc0fcc31726c8c0ae90657512bd95bc983d1a8e4b (diff)
parentf5d962579bbe4add4dad10664e73e7c43209a1c5 (diff)
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedded into org.openembedded.dev
Conflicts: packages/images/fso-image.bb
Diffstat (limited to 'packages/tasks')
-rw-r--r--packages/tasks/task-cli-tools.bb10
-rw-r--r--packages/tasks/task-python-everything.bb3
2 files changed, 9 insertions, 4 deletions
diff --git a/packages/tasks/task-cli-tools.bb b/packages/tasks/task-cli-tools.bb
index 8bc4b83211..e69c2924a2 100644
--- a/packages/tasks/task-cli-tools.bb
+++ b/packages/tasks/task-cli-tools.bb
@@ -2,17 +2,17 @@ DESCRIPTION = "A set of command line tools"
SECTION = "console"
LICENSE = "MIT"
PV = "1.0"
-PR = "r0"
+PR = "r1"
inherit task
+PACKAGES += "${PN}-python"
+
RDEPENDS_${PN} = "\
dosfstools \
htop \
iptables \
lsof \
- mickeydbus \
- mickeyterm \
mtd-utils \
nano \
powertop \
@@ -27,3 +27,7 @@ RDEPENDS_${PN}_append_om-gta02 = "\
s3c24xx-gpio \
"
+RDEPENDS_${PN}-python = "\
+ mickeydbus \
+ mickeyterm \
+"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 5b0d4a1be6..02cecbf586 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml35"
+PR = "ml36"
RDEPENDS = "\
python-ao \
@@ -16,6 +16,7 @@ RDEPENDS = "\
python-fnorb \
python-formencode \
python-fpconst \
+ python-fugrep \
python-fuse \
python-fusil \
python-gammu \