move lora logging configuration to new recipe

8 files changed, 289 insertions, 26 deletions

diff --git a/recipes-connectivity/lora/lora-logging.bb b/recipes-connectivity/lora/lora-logging.bb
new file mode 100644
index 0000000..2a75eea
--- /dev/null
+++ b/recipes-connectivity/lora/lora-logging.bb
@@ -0,0 +1,17 @@
+DECRIPTION = "MultiTech LoRa Logging"
+PRIORITY = "optional"
+SECTION = "console/utils"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae2ad602b723a163cd33ca5ee991fbcd"
+DEPENDS = ""
+PR = "r0"
+RDEPENDS_${PN} += "logrotate bash"
+
+SRC_URI = "file://lora-logging.logrotate.conf \
+          "
+
+do_install() {
+    install -d ${D}${sysconfdir}/logrotate.d
+    install -m 0644 ${WORKDIR}/lora-logging.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-logging.conf
+}
+
diff --git a/recipes-connectivity/lora/lora-logging/LICENSE b/recipes-connectivity/lora/lora-logging/LICENSE
new file mode 100644
index 0000000..6f3f3d7
--- /dev/null
+++ b/recipes-connectivity/lora/lora-logging/LICENSE
@@ -0,0 +1,265 @@
+IMPORTANT – READ BEFORE OPERATING OR INSTALLING THE MULTI-TECH PRODUCT OR SOFTWARE

+

+MULTI-TECH SYSTEMS, INC.

+END USER LICENSE AGREEMENT

+PLEASE READ THIS END USER LICENSE AGREEMENT (“AGREEMENT”) CAREFULLY BEFORE USING THE MULTI-TECH PRODUCT, INSTALLING OR ACCESSING THE SOFTWARE, OR DOWNLOADING ANY SOFTWARE UPDATES FOR USE WITH THE MULTI-TECH PRODUCT. BY USING THE MULTI-TECH PRODUCT, INSTALLING OR ACCESSING THE SOFTWARE OR DOWNLOADING SOFTWARE UPDATES FOR THE MULTI-TECH PRODUCT, YOU AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT USE THE MULTI-TECH PRODUCT, INSTALL OR ACCESS THE SOFTWARE, OR DOWNLOAD THE SOFTWARE UPDATES. INSTEAD, PLEASE CONTACT MULTI-TECH’S CUSTOMER SERVICE DEPARTMENT AT customerservice@multitech.com. 

+

+1. DEFINITIONS. The following terms are defined as follows: (a) ”Documentation” means any user guides, data sheets, manuals, specifications, or other written description of the Software provided by Multi-Tech; (b) “Multi-Tech” means, collectively, Multi-Tech Systems, Inc., its directors, officers, employees, representatives, agents, licensors, and affiliated entities; (c) “Software” means, collectively, (i) the software provided by Multi-Tech, (ii) the software pre-installed on any Multi-Tech product, and (iii) any Documentation; and (d) “You” means you, an individual, if you are accessing the Software on your behalf, or if you are accessing the Software on behalf of your employer or a third party, “You” means the legal entity of the employer or third party as applicable. 

+

+2. ACCEPTANCE. You accept the terms of this Agreement either by: (a) clicking “I Accept” when offered by Multi-Tech; or (b) using the Multi-Tech product, installing or accessing the Software or downloading Software updates. You acknowledge and agree that You have read and understood this Agreement, have had an opportunity to discuss this Agreement with Your legal and other advisors, and agree to be bound by the terms and conditions of this Agreement. 

+

+3. LICENSE. The Software is licensed, and is not sold. Subject to the terms of this Agreement, You are granted a limited, non-transferable, non-exclusive license that permits You to use the Software with the Multi-Tech product for internal business or personal use. This License does not grant to You any rights to re-license or sublicense or otherwise resell or re-distribute the Software. This License does not grant to You any rights to obtain future Software updates (e.g., upgrades, fixes, etc.). If future Software updates are obtained by You, whether through a version release, Multi-Tech technical support, or another Multi-Tech authorized method, such Software updates are subject to the terms of this Agreement. If applicable, any previous version of the Software must be destroyed or returned to Multi-Tech within 90 days of receipt of the Software updates. 

+

+4. RESTRICTIONS. This Agreement does not authorize You to: (a) sell, lease, copy, assign, license, sublicense, translate, distribute, or otherwise transfer, in whole or in part, the Software; (b) modify, distribute, copy, reproduce, or publish, in whole or in part, the Documentation; (c) use the Software on a timesharing basis to operate a service bureau facility or providing hosting of the Software for the benefit of third parties; (d) decompile, disassemble, reverse engineer or otherwise attempt to derive source code from the Software, except as, and then only to the extent, required by applicable law or an applicable open source license; (e) modify or create derivative works of the Software; or (f) create, develop, license, install, use or deploy any software or services to circumvent, enable, modify or provide access, permissions or rights which violate the technical restrictions in the Software. You acknowledge and agree that the Software and Documentation is subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to strictly comply with all such regulations and acknowledge that You are responsible for obtaining any applicable licenses to export, re-export or import the Software and Documentation.

+

+5. OWNERSHIP; CONFIDENTIALITY. You agree that the Software contains trade secret information, copyrights, trademarks, and other intellectual property rights that are owned by Multi-Tech Systems, Inc. or its licensors. Multi-Tech retains all right, title and interest in and to the Software. All rights not expressly granted herein are reserved. You acknowledge and agree that the Software was developed at considerable time and expense by Multi-Tech and is confidential to and a trade secret of Multi-Tech. You agree to maintain the Software in strict confidence and not disclose the Software or provide access thereto to any other third party.

+

+6. THIRD PARTY SOFTWARE. The Software may contain software from sources other than Multi-Tech Systems, Inc., including without limitation, third party proprietary software and free and open source software. To the extent the Software includes free and open source software, it is subject to the applicable free and open source software license. Multi-Tech Systems, Inc. makes available information related to the free and open source software at www.multitech.com/licensing.go or upon written request. 

+

+7. DISCLAIMER OF WARRANTY. EXCEPT AS SET FORTH IN THE MULTI-TECH STANDARD WARRANTY THAT ACCOMPANIES THE MULTI-TECH PRODUCT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES OF THE SOFTWARE, SUCH AS THE IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, OR OTHERWISE ARISING FROM A COURSE OF DEALING, USAGE, OR TRADE PRACTICE, ARE HEREBY EXCLUDED TO THE EXTENT ALLOWED BY APPLICABLE LAW. 

+

+8. LIMITATION OF LIABILITY. TO THE FULLEST EXTENT ALLOWABLE BY APPLICABLE LAW, Multi-Tech IS NOT LIABLE TO YOU FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES, INCLUDING WITHOUT LIMITATION, LOST PROFITS, LOST REVENUE AND BUSINESS INTERRUPTION, ARISING OUT OF THE SOFTWARE, WHETHER BASED ON CONTRACT, TORT, OR OTHER THEORY AND REGARDLESS OF WHETHER SUCH PERSON OR ENTITY SHALL BE ADVISED OR HAVE REASON TO KNOW OF THE POSSIBILITY OF SUCH DAMAGES. IF Multi-Tech IS EVER DEEMED LIABLE TO YOU, ITS AGGREGATE LIABILITY, WHETHER BASED IN TORT, CONTRACT, STATUTE OR OTHERWISE, IS LIMITED TO THE NET AMOUNT PAID BY YOU FOR THE Multi-Tech PRODUCT.

+

+9. TERMINATION. Multi-Tech may, upon written notice to You, immediately terminate this Agreement and the warranty period set forth in the Multi-Tech Standard Warranty if You breach the terms set forth in this Agreement.

+

+10. GENERAL. This Agreement: (a) contains the complete and exclusive agreement regarding its subject matter, (b) supersedes all prior or contemporaneous written or oral agreements, representations, promises, and understandings related thereto (except those previously referenced third party license agreements), (c) may be modified, supplemented or amended by Multi-Tech with or without notice (which modification, supplement or amendment may be made available with Software updates or future purchases of Multi-Tech products), (d) is between sophisticated parties, and so the rule of construing ambiguities against the drafter will not apply, (e) will be governed by Minnesota law, without regard to its choice of law provisions, and (f) is binding upon the parties and their successors, will not benefit or create any right or cause of action for any other person or entity other than the parties, except Multi-Tech’s third party licensors. No waiver of this Agreement is effective by Multi-Tech unless in writing signed by a duly authorized representative. If any provision of this Agreement is held to be invalid, it shall be interpreted so as to best advance the spirit of this Agreement and Multi-Tech’s intent. All disputes arising from this Agreement shall be heard in the exclusive jurisdiction of the state courts of Minnesota, U.S.A. and You agree to submit to the personal jurisdiction of such courts. You acknowledge that You are age thirteen or older, and by accepting this Agreement, You agree that You are fully authorized, able and competent to enter into this Agreement.

+

+   Multi-Tech Systems, Inc. 

+   2205 Woodale Drive

+   Mounds View, Minnesota 55112

+   customerservice@multitech.com 

+   20130910

+

+-----------------------------------------------------------------------------------------

+                              Open Source Licenses

+-----------------------------------------------------------------------------------------

+

+-----------------------------------------

+        crc64 implementation 

+-----------------------------------------

+

+/* Redis uses the CRC64 variant with "Jones" coefficients and init value of 0.

+ *

+ * Specification of this CRC64 variant follows:

+ * Name: crc-64-jones

+ * Width: 64 bites

+ * Poly: 0xad93d23594c935a9

+ * Reflected In: True

+ * Xor_In: 0xffffffffffffffff

+ * Reflected_Out: True

+ * Xor_Out: 0x0

+ * Check("123456789"): 0xe9c6d914c4b8d9ca

+ *

+ * Copyright (c) 2012, Salvatore Sanfilippo <antirez at gmail dot com>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ *   * Redistributions of source code must retain the above copyright notice,

+ *     this list of conditions and the following disclaimer.

+ *   * Redistributions in binary form must reproduce the above copyright

+ *     notice, this list of conditions and the following disclaimer in the

+ *     documentation and/or other materials provided with the distribution.

+ *   * Neither the name of Redis nor the names of its contributors may be used

+ *     to endorse or promote products derived from this software without

+ *     specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE. */

+

+-----------------------------------------

+       mosquitto implementation

+-----------------------------------------

+

+Copyright (c) 2010-2013 Roger Light <roger@atchoo.org>

+

+All rights reserved. This program and the accompanying materials

+are made available under the terms of the Eclipse Public License v1.0

+and Eclipse Distribution License v1.0 which accompany this distribution.

+ 

+The Eclipse Public License is available at

+   http://www.eclipse.org/legal/epl-v10.html

+and the Eclipse Distribution License is available at

+  http://www.eclipse.org/org/documents/edl-v10.php.

+ 

+Contributors:

+   Roger Light - initial implementation and documentation.

+

+-----------------------------------------

+         aes implementation

+-----------------------------------------

+

+/*

+ ---------------------------------------------------------------------------

+ Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved.

+

+ LICENSE TERMS

+

+ The redistribution and use of this software (with or without changes)

+ is allowed without the payment of fees or royalties provided that:

+

+ 1. source code distributions include the above copyright notice, this

+ list of conditions and the following disclaimer;

+

+ 2. binary distributions include the above copyright notice, this list

+ of conditions and the following disclaimer in their documentation;

+

+ 3. the name of the copyright holder is not used to endorse products

+ built using this software without specific written permission.

+

+ DISCLAIMER

+

+ This software is provided 'as is' with no explicit or implied warranties

+ in respect of its properties, including, but not limited to, correctness

+ and/or fitness for purpose.

+ ---------------------------------------------------------------------------

+ Issue 09/09/2006

+

+ This is an AES implementation that uses only 8-bit byte operations on the

+ cipher state (there are options to use 32-bit types if available).

+

+ The combination of mix columns and byte substitution used here is based on

+ that developed by Karl Malbrain. His contribution is acknowledged.

+ */

+

+-----------------------------------------

+       cmac implementation

+-----------------------------------------

+

+/**************************************************************************

+ Copyright (C) 2009 Lander Casado, Philippas Tsigas

+

+ All rights reserved.

+

+ Permission is hereby granted, free of charge, to any person obtaining

+ a copy of this software and associated documentation files 

+ (the "Software"), to deal with the Software without restriction, including

+ without limitation the rights to use, copy, modify, merge, publish, 

+ distribute, sublicense, and/or sell copies of the Software, and to

+ permit persons to whom the Software is furnished to do so, subject to

+ the following conditions: 

+

+ Redistributions of source code must retain the above copyright notice, 

+ this list of conditions and the following disclaimers. Redistributions in

+ binary form must reproduce the above copyright notice, this list of

+ conditions and the following disclaimers in the documentation and/or 

+ other materials provided with the distribution.

+

+ In no event shall the authors or copyright holders be liable for any special,

+ incidental, indirect or consequential damages of any kind, or any damages 

+ whatsoever resulting from loss of use, data or profits, whether or not 

+ advised of the possibility of damage, and on any theory of liability, 

+ arising out of or in connection with the use or performance of this software.

+ 

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 

+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 

+ DEALINGS WITH THE SOFTWARE

+

+ *****************************************************************************/

+

+

+---------------------------------------------------

+        picosha2 implementation

+---------------------------------------------------

+

+MIT License

+

+Copyright (c) 2017 okdshin

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+-----------------------------------------------------------------

+RapidJSON

+-----------------------------------------------------------------

+

+Tencent is pleased to support the open source community by making RapidJSON available. 

+ 

+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.

+

+If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.

+If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.

+A copy of the MIT License is included in this file.

+

+Other dependencies and licenses:

+

+Open Source Software Licensed Under the BSD License:

+--------------------------------------------------------------------

+

+The msinttypes r29 

+Copyright (c) 2006-2013 Alexander Chemeris 

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+

+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 

+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

+* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+Open Source Software Licensed Under the JSON License:

+--------------------------------------------------------------------

+

+json.org 

+Copyright (c) 2002 JSON.org

+All Rights Reserved.

+

+JSON_checker

+Copyright (c) 2002 JSON.org

+All Rights Reserved.

+

+  

+Terms of the JSON License:

+---------------------------------------------------

+

+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+

+The Software shall be used for Good, not Evil.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Terms of the MIT License:

+--------------------------------------------------------------------

+

+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+

diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf
index 01a1cc0..01a1cc0 100644
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.logrotate.conf
+++ b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf
diff --git a/recipes-connectivity/lora/lora-network-server_2.0.19.bb b/recipes-connectivity/lora/lora-network-server_2.0.19.bb
index 4b26bcb..27d9139 100644
--- a/recipes-connectivity/lora/lora-network-server_2.0.19.bb
+++ b/recipes-connectivity/lora/lora-network-server_2.0.19.bb
@@ -4,14 +4,13 @@ SECTION = "console/utils"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae2ad602b723a163cd33ca5ee991fbcd"
 DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash lora-logging"
 PR = "r4"
 CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server"
 
 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] = "76f2d85f2aeeecc5727e03f7ef4d75c7"
@@ -42,8 +41,6 @@ do_install() {
     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
 }
 
 FILES_${PN} += "${LORA_DIR}"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/lora-packet-forwarder-geolocation.logrotate.conf b/recipes-connectivity/lora/lora-packet-forwarder-geolocation/lora-packet-forwarder-geolocation.logrotate.conf
deleted file mode 100644
index 01a1cc0..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation/lora-packet-forwarder-geolocation.logrotate.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/lora-*.log {
-    size 512k
-    rotate 4
-    compress
-    copytruncate
-    missingok
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb
index 8f66008..f6e62f8 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://mlinux4/LICENSE.TXT;md5=86776875df1423114abfcec938f3e565"
-DEPENDS ?= "lora-gateway-geolocation logrotate"
+DEPENDS ?= "lora-gateway-geolocation logrotate lora-logging"
 RDEPENDS_${PN} += "bash"
 # Source revision
 PSR = "r1"
@@ -13,8 +13,12 @@ PR = "r3"
 
 SRCREV = "v${PV}"
 
+<<<<<<< Updated upstream
 SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}-${PSR}.tar.gz \
            file://lora-packet-forwarder-geolocation.logrotate.conf \
+=======
+SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}.tar.gz \
+>>>>>>> Stashed changes
            file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 \            
            file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 \
            file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 \
@@ -47,9 +51,6 @@ do_install() {
   install -m 755 ${WORKDIR}/global_conf.json.MTAC_LORA_2_1* ${D}${LORA_DIR}/
   install -d ${D}${LORA_DIR}/forwarder-utils-geo
   install -m 755 mlinux4/forwarder-utils-geo/* ${D}${LORA_DIR}/forwarder-utils-geo/
-
-  install -d ${D}${sysconfdir}/logrotate.d
-  install -m 0644 ${WORKDIR}/lora-packet-forwarder-geolocation.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-packet-forwarder-geolocation.conf
 }
 
 
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.logrotate.conf b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.logrotate.conf
deleted file mode 100644
index 01a1cc0..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.logrotate.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/lora-*.log {
-    size 512k
-    rotate 4
-    compress
-    copytruncate
-    missingok
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb
index 23709e0..f7dbbdf 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
-DEPENDS = "lora-gateway logrotate"
+DEPENDS = "lora-gateway logrotate lora-logging"
 RDEPENDS_${PN} += "bash"
 PR = "r12"
 
@@ -15,7 +15,6 @@ 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://lora-packet-forwarder.logrotate.conf \
            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 \
@@ -68,8 +67,6 @@ do_install() {
   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
-  install -d ${D}${sysconfdir}/logrotate.d
-  install -m 0644 ${WORKDIR}/lora-packet-forwarder.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-packet-forwarder.conf
 }
 
 do_install_append_mtcdt() {