Merge remote-tracking branch 'origin/6' into mpower-dev-nxp

6 files changed, 9 insertions, 8 deletions

diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
index 063c931..40dc9a2 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
@@ -2,6 +2,7 @@
     "SX130x_conf": {
         "com_type": "SPI",
         "com_path": "/dev/spidev0.0",
+        "tmp102": 72,
         "lorawan_public": true,
         "clksrc": 0,
         "antenna_gain": 0, /* antenna gain, in dBi */
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
index 04434bf..3719762 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
@@ -2,6 +2,7 @@
     "SX130x_conf": {
         "com_type": "SPI",
         "com_path": "/dev/spidev0.0",
+        "tmp102": 72,
         "lorawan_public": true,
         "clksrc": 0,
         "antenna_gain": 0, /* antenna gain, in dBi */
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
index 2f17d34..f1652ca 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
@@ -2,6 +2,7 @@
     "SX130x_conf": {
         "com_type": "SPI",
         "com_path": "/dev/spidev1.0",
+        "tmp102": 72,
         "lorawan_public": true,
         "clksrc": 0,
         "antenna_gain": 0, /* antenna gain, in dBi */
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
index e89cc16..21e906d 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
@@ -2,6 +2,7 @@
     "SX130x_conf": {
         "com_type": "SPI",
         "com_path": "/dev/spidev1.0",
+        "tmp102": 72,
         "lorawan_public": true,
         "clksrc": 0,
         "antenna_gain": 0, /* antenna gain, in dBi */
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.4.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb
index fb2d708..fb2d708 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.4.bb
+++ b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb
diff --git a/recipes-connectivity/lora/lora-gateway_5.0.6.bb b/recipes-connectivity/lora/lora-gateway_5.0.10.bb
index f16cadf..6be0c47 100644
--- a/recipes-connectivity/lora/lora-gateway_5.0.6.bb
+++ b/recipes-connectivity/lora/lora-gateway_5.0.10.bb
@@ -6,17 +6,16 @@ SECTION = "console/utils"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
 DEPENDS = "gpsd"
+RDEPENDS_${PN} = "libgps"
 
-PR = "r23"
-SRCREV = "004c03449d498cfa495df4d7834b733f4697a10f"
+PR = "r32"
+SRCREV = "${PV}"
 
-SRC_URI = "git://git@gitlab.multitech.net/lora_enterprise/lora_gateway_mtac_full.git;protocol=ssh;branch=master \
+SRC_URI = "git://git.multitech.net/lora_gateway_mtac_full;branch=master;protocol=git \
            file://library_4.0.cfg \
            file://ln-lora-spi-dev.sh \
           "
 
-SRC_URI[md5sum] = "9e06a3733a9fea39a3d61f77b412badf"
-SRC_URI[sha256sum] = "28fbfe098013908794b32e51d1fed4427f20dd6c8adbbca78df2e1800f5c84dc"
 
 S = "${WORKDIR}/git"
 
@@ -28,7 +27,7 @@ do_configure_append() {
 }
 
 do_compile() {
-    oe_runmake LDFLAGS=${LDFLAGS}
+    oe_runmake
 }
 
 do_install() {
@@ -55,7 +54,6 @@ do_install_append_mtcdt() {
 	install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/
 }
 
-
 PACKAGES += "${PN}-utils ${PN}-utils-dbg"
 
 FILES_${PN} = "${libdir}/lora/lora-gw-readme.md"
@@ -68,4 +66,3 @@ FILES_${PN}-staticdev = "${libdir}/lora/libloragw.a"
 do_rm_work() {
 	echo "skipping"
 }
-