task-fso* compliance: update requirements and include it in shr-image

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index 7f1968e..0498d3b 100644 (file)
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -3,7 +3,7 @@
 #------------------------------------------------------
 
 PV = "2.0"
-PR = "r7"
+PR = "r8"
 
 
 DEPENDS += "task-shr-minimal"
@@ -33,7 +33,7 @@ IMAGE_INSTALL += "\
   task-shr-minimal-gtk \
   task-shr-minimal-x \
   task-x11-illume \
-  task-fso-compliance \
+  task-fso2-compliance \
   task-fonts-truetype-core \
 "
 

diff --git a/recipes/tasks/task-fso-compliance.bb b/recipes/tasks/task-fso-compliance.bb
index 62193ff..e1776a8 100644 (file)
--- a/recipes/tasks/task-fso-compliance.bb
+++ b/recipes/tasks/task-fso-compliance.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The freesmartphone.org framework -- install this task to make you
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r7"
+PR = "r8"
 
 inherit task
 
@@ -11,16 +11,16 @@ RDEPENDS_${PN} = "\
   frameworkd \
 #  fso-apmd \
   fso-gpsd \
-  fso-monitord \
+#  fso-monitord \
   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 \

diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb
index 0ab234d..ba9bf3e 100644 (file)
--- a/recipes/tasks/task-fso2-compliance.bb
+++ b/recipes/tasks/task-fso2-compliance.bb
@@ -3,12 +3,14 @@ Install this task to make your distribution FSO 2.0-compliant."
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.9.0"
-PR = "r1"
+PR = "r2"
 
 inherit task
 
 RDEPENDS_${PN} = "\
   dbus-hlid \
+# TODO: remove when fso2 is finished
+  frameworkd \
   \
   libfsobasics \
   libfsotransport \
@@ -16,9 +18,9 @@ RDEPENDS_${PN} = "\
   libfsoresource \
   \
   fsodeviced \
-  fsogsmd \
+#  fsogsmd \
   fsonetworkd \
-  fsotimed \
+#  fsotimed \
   fsousaged \
   \
   fso-alsa-data \