diff options
| author | Jason Reiss <jreiss@multitech.com> | 2015-10-21 15:58:43 -0500 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2015-10-21 15:58:43 -0500 |
| commit | eb60c9c535be9a16e7f63084f23dd1b687f30ec3 (patch) | |
| tree | f7e9f8bb6af048f00c14106b0c4ec1f80226459e /recipes-connectivity/lora | |
| parent | 2fc8b56bf20c37791931f42359b8099b04808015 (diff) | |
| parent | 345cfbb0c73f47dcbbe28d50edd8b15b9090a68f (diff) | |
| download | meta-mlinux-eb60c9c535be9a16e7f63084f23dd1b687f30ec3.tar.gz meta-mlinux-eb60c9c535be9a16e7f63084f23dd1b687f30ec3.tar.bz2 meta-mlinux-eb60c9c535be9a16e7f63084f23dd1b687f30ec3.zip | |
Merge branch 'master' of git.multitech.net:meta-mlinux
Conflicts:
recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch
Diffstat (limited to 'recipes-connectivity/lora')
| -rw-r--r-- | recipes-connectivity/lora/lora-network-server_0.0.8.bb (renamed from recipes-connectivity/lora/lora-network-server_0.0.7.bb) | 4 | ||||
| -rw-r--r-- | recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-connectivity/lora/lora-network-server_0.0.7.bb b/recipes-connectivity/lora/lora-network-server_0.0.8.bb index 6e6cc17..d2f55e8 100644 --- a/recipes-connectivity/lora/lora-network-server_0.0.7.bb +++ b/recipes-connectivity/lora/lora-network-server_0.0.8.bb @@ -13,8 +13,8 @@ SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${ file://lora-network-server.logrotate.conf \ " -SRC_URI[md5sum] = "c22a75e96f22f55054796dfb04540d49" -SRC_URI[sha256sum] = "27be3a327ba4c3b7eba4c4fe896de0a67f6a394257be0440ab4ea02238d8e097" +SRC_URI[md5sum] = "8cb2686b427a32d53e301e87870b49cf" +SRC_URI[sha256sum] = "be7de4463f17645882ed6194d9af2bc9a4608005635c8d31d5c5ec8bf552c73f" # binaries are already stripped, so suppress warning INSANE_SKIP_${PN} = "already-stripped" diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch index bef41c9..cd9a727 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch +++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch @@ -159,8 +159,8 @@ index e20dfc1..4d0bb35 100644 } MSG("\nINFO: End of downstream thread\n"); } - -diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c + +iff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c index 79f7584..3d1cbf8 100644 --- a/gps_pkt_fwd/src/gps_pkt_fwd.c +++ b/gps_pkt_fwd/src/gps_pkt_fwd.c |