From 42a6b8b0a1a5fd64212a3cf4f007218ede4e8b40 Mon Sep 17 00:00:00 2001
From: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Date: Fri, 16 Sep 2016 17:01:10 +0200
Subject: [PATCH] modemmanger: add modemmanager 1.6.0

---
 conf/layer.conf                       | 10 +++++-----
 recipes-core/images/nmrouter-image.bb |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 8f15885..5bfbda6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -4,12 +4,12 @@ BBPATH .= ":${LAYERDIR}"
 # We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "nrhw15"
-BBFILE_PATTERN_nrhw15 = "^${LAYERDIR}/"
-BBFILE_PRIORITY_nrhw15 = "1"
+BBFILE_COLLECTIONS += "nmrouter"
+BBFILE_PATTERN_nmrouter = "^${LAYERDIR}/"
+BBFILE_PRIORITY_nmrouter = "10"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
-LAYERVERSION_nrhw15 = "1"
+LAYERVERSION_nmrouter = "1"
 
-LAYERDEPENDS_nrhw15 = "core"
+LAYERDEPENDS_nmrouter = "core"
diff --git a/recipes-core/images/nmrouter-image.bb b/recipes-core/images/nmrouter-image.bb
index 1802dbd..21c63fc 100644
--- a/recipes-core/images/nmrouter-image.bb
+++ b/recipes-core/images/nmrouter-image.bb
@@ -42,6 +42,7 @@ IMAGE_INSTALL_append = " \
                 cockpit \
                 board-descriptor \
                 sw-update \
+                python-pip \
                 ${FIRMWARE} \
                 "
 
@@ -51,6 +52,8 @@ IMAGE_INSTALL_append_am335x-nbhw16 = " \
                 nbhw16-ctrl \
                 tibluetooth \
                 bluez5-obex \
+                bluez5-noinst-tools \
+                python-pygattlib \
                 "
 
 LICENSE = "BSD"