Remove use of gconnman as it's no longer maintained nor used

Also update the carrick fixed revision

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta-moblin/packages/carrick/carrick_git.bb b/meta-moblin/packages/carrick/carrick_git.bb
index 7dd3d7b63880a7f67ec758788c64f739b348a43b..10b402c81956a9e1819508b333ad314d51ec56a3 100644 (file)
--- a/meta-moblin/packages/carrick/carrick_git.bb
+++ b/meta-moblin/packages/carrick/carrick_git.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 PV = "0.0+git${SRCPV}"
 PR = "r1"
 
-DEPENDS = "gconnman nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
-RDEPENDS = "connman gconnman"
+DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
+RDEPENDS = "connman"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta-moblin/packages/gconnman/gconnman_git.bb b/meta-moblin/packages/gconnman/gconnman_git.bb
deleted file mode 100644 (file)
index d3ba67a..0000000
--- a/meta-moblin/packages/gconnman/gconnman_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Glib bindings to connman"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "connman glib-2.0 dbus-glib gtk+"
-
-inherit autotools_stage

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 7a89dadc36c5e60898386a715eaa6e2a1b4d4fa2..7674db261a78cb12ff3affc7a5a03b7d04e94a47 100644 (file)
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -210,7 +210,7 @@ SRCREV_pn-anerley ?= "fbb12f9f415ba2882deef04640cc0bffee6a1b60"
 SRCREV_pn-bickley ?= "f4484ec4fd2bce120a5dc38a4a9767bf01e143bd"
 SRCREV_pn-bisho ?= "20c07ff7e9a1f053b5a142fe2fcfe173e189a033"
 SRCREV_pn-bognor-regis ?= "85ce627e828cb0055a58f96259b5934f71d4ca6e"
-SRCREV_pn-carrick ?= "34d785c70da5392285b9e554d9c1779eb7390438"
+SRCREV_pn-carrick ?= "c6006005f4924960a867b294192c12c5921679c3"
 SRCREV_pn-clutter ?= "d1232509a21a7ce05aa8c85b2c14872ffc4df5cb"
 SRCREV_pn-clutter-1.0 ?= "420ed353b53bd624331bd249d7df98d14714b504"
 SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"