summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-02-22 20:54:54 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-02-22 20:54:54 +0100
commit6dd8e30f6fb403b2de61dff7089fb52b48ddaba0 (patch)
treec3d37a3242a7cf9c9e75b72b7ebf00c158216188
parent62ad3249b237f03453b00d16b215fe1580cb7232 (diff)
task-cli-tools: add mterm2 and remove from task-fso2-compliance
-rw-r--r--recipes/images/fso2-console-image.bb5
-rw-r--r--recipes/tasks/task-cli-tools.bb5
-rw-r--r--recipes/tasks/task-fso2-compliance.bb18
3 files changed, 12 insertions, 16 deletions
diff --git a/recipes/images/fso2-console-image.bb b/recipes/images/fso2-console-image.bb
index 613962925d..4140bc47c9 100644
--- a/recipes/images/fso2-console-image.bb
+++ b/recipes/images/fso2-console-image.bb
@@ -5,14 +5,11 @@
require fso-image.inc
PV = "1.1"
-PR = "r2"
+PR = "r3"
IMAGE_INSTALL = "\
task-base \
task-fso2-compliance \
task-cli-tools \
task-cli-tools-python \
- \
- mdbus2 \
- mterm2 \
"
diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb
index e538365aea..93ab1945d3 100644
--- a/recipes/tasks/task-cli-tools.bb
+++ b/recipes/tasks/task-cli-tools.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A set of command line tools useful for debugging"
SECTION = "console"
LICENSE = "MIT"
PV = "1.0"
-PR = "r11"
+PR = "r12"
inherit task
@@ -14,8 +14,9 @@ RDEPENDS_${PN} = "\
iptables \
lsof \
mbuffer \
- mtd-utils \
mdbus2 \
+ mtd-utils \
+ mterm2 \
nano \
nfs-utils-client \
powertop \
diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb
index de7d6c1281..bc5705bc1c 100644
--- a/recipes/tasks/task-fso2-compliance.bb
+++ b/recipes/tasks/task-fso2-compliance.bb
@@ -9,8 +9,6 @@ inherit task
RDEPENDS_${PN} = "\
dbus-hlid \
-# TODO: remove when fso2 is finished
- frameworkd \
\
libfsobasics \
libfsotransport \
@@ -21,7 +19,7 @@ RDEPENDS_${PN} = "\
fsodeviced \
fsogsmd \
fsotdld \
- fsomusicd \
+# fsomusicd \
fsonetworkd \
fsousaged \
\
@@ -29,23 +27,23 @@ RDEPENDS_${PN} = "\
fso-apm \
fso-gpsd \
# fso-monitord \
- connman \
+# connman \
# connman-scripts \
- connman-plugin-bluetooth \
+# connman-plugin-bluetooth \
# connman-plugin-dhclient \
# connman-plugin-dnsproxy \
# connman-plugin-ethernet \
# connman-plugin-fake \
- connman-plugin-loopback \
- connman-plugin-pppd \
+# connman-plugin-loopback \
+# connman-plugin-pppd \
# connman-plugin-resolvconf \
- connman-plugin-udhcp \
- connman-plugin-wifi \
+# connman-plugin-udhcp \
+# connman-plugin-wifi \
# connman-test-utils \
"
RRECOMMENDS_${PN} = "\
- fso-abyss \
+# fso-abyss \
wmiconfig \
tzdata \
tzdata-africa \