From 56160c19c1ac5af48c2826ff5be9858b19200210 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 6 Jul 2017 08:42:01 -0500
Subject: merge work files were accidentally integrated.

---
 .../lora/lora-network-server_1.0.35.bb.orig        | 49 -------------
 .../lora/lora-packet-forwarder_3.1.0.bb.orig       | 84 ----------------------
 2 files changed, 133 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-network-server_1.0.35.bb.orig
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb.orig

diff --git a/recipes-connectivity/lora/lora-network-server_1.0.35.bb.orig b/recipes-connectivity/lora/lora-network-server_1.0.35.bb.orig
deleted file mode 100644
index e5c7bf7..0000000
--- a/recipes-connectivity/lora/lora-network-server_1.0.35.bb.orig
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
-PR = "r1"
-
-SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-           file://lora-network-server.logrotate.conf \
-          "
-
-SRC_URI[md5sum] = "2eeb170827e49a0962a2f563ccdeeca5"
-SRC_URI[sha256sum] = "d706ec6a7f7cb7b76dace93ea5b3411495f62cc00f90683e40d9d1502b4a247f"
-
-# binaries are already stripped, so suppress warning
-INSANE_SKIP_${PN} = "already-stripped"
-
-S = "${WORKDIR}"
-
-LORA_DIR = "/opt/lora"
-
-do_compile() {
-}
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "lora-network-server"
-INITSCRIPT_PARAMS = "defaults 80 30"
-
-do_install() {
-    install -d ${D}${LORA_DIR}
-    install -m 0755 lora-network-server ${D}${LORA_DIR}/
-    install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
-}
-
-CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb.orig b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb.orig
deleted file mode 100644
index 114c504..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb.orig
+++ /dev/null
@@ -1,84 +0,0 @@
-DESCRIPTION = "LoRa Packet Forwarder"
-HOMEPAGE = "https://github.com/Lora-net/packet_forwarder"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
-DEPENDS = "lora-gateway"
-PR = "r9"
-
-SRCREV = "v${PV}"
-
-SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
-           file://README.md \
-           file://lora-packet-forwarder.init \
-           file://lora-packet-forwarder.default \
-           file://global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic \
-           file://local_conf.json \
-           file://lora-packet-forwarder-add-spi-dev-path.patch \
-           file://lora-packet-forwarder-remove-jit-power-check.patch \
-"
-
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-LORA_DIR = "/opt/lora"
-
-export LGW_PATH = "${STAGING_LIBDIR}/lora"
-export LGW_INC = "${STAGING_INCDIR}/lora"
-
-<<<<<<< HEAD
-CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
-=======
-CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11 "
->>>>>>> 14559d8... Need to define __USE_XOPEN2K for struct addrinfo in netdb.h
-
-do_compile() {
-  oe_runmake
-}
-
-do_install() {
-  install -d ${D}${LORA_DIR}
-  install -m 755 lora_pkt_fwd/lora_pkt_fwd ${D}${LORA_DIR}/
-  install -m 755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/
-
-  install -d ${D}${LORA_DIR}/forwarder-utils
-  install -m 755 util_sink/util_sink ${D}${LORA_DIR}/forwarder-utils/
-  install -m 755 util_ack/util_ack ${D}${LORA_DIR}/forwarder-utils/
-  install -m 755 util_tx_test/util_tx_test ${D}${LORA_DIR}/forwarder-utils/
-  install -m 755 ${WORKDIR}/README.md  ${D}${LORA_DIR}/
-
-  install -d ${D}${sysconfdir}/default
-  install -m 0644 ${WORKDIR}/lora-packet-forwarder.default ${D}${sysconfdir}/default/lora-packet-forwarder
-  install -d ${D}${sysconfdir}/init.d
-  install -m 0755 ${WORKDIR}/lora-packet-forwarder.init ${D}${sysconfdir}/init.d/lora-packet-forwarder
-}
-
-do_install_append_mtcdt() {
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.US915
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.US915
-}
-
-do_install_append_mtcap() {
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json
-}
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug ${LORA_DIR}/forwarder-utils/.debug"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-  echo "skipping"
-}
-- 
cgit v1.2.3