From 86d3fd8e3e86bb3a30d55c3719c77d9ebb7c3604 Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Wed, 11 Jul 2018 11:59:35 -0500 Subject: move lora logging configuration to new recipe --- .../lora/lora-packet-forwarder-geolocation_5.1.0.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb') 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 } -- cgit v1.2.3