diff options
Diffstat (limited to 'recipes-connectivity/lora')
8 files changed, 148 insertions, 26 deletions
diff --git a/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb index 403670a..511a8b3 100644 --- a/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb +++ b/recipes-connectivity/lora/lora-gateway-geolocation_5.1.0.bb @@ -27,6 +27,9 @@ do_compile() { } do_install() { +} + +do_install_append_mtcdt() { install -d ${D}${includedir}/lora install -d ${D}${libdir}/lora install -m 0644 mlinux4/libsx1301ar/* ${D}${includedir}/lora diff --git a/recipes-connectivity/lora/lora-gateway_5.0.1.bb b/recipes-connectivity/lora/lora-gateway_5.0.1.bb index faec985..a86b23a 100644 --- a/recipes-connectivity/lora/lora-gateway_5.0.1.bb +++ b/recipes-connectivity/lora/lora-gateway_5.0.1.bb @@ -5,25 +5,17 @@ SECTION = "console/utils" # Semtech license is a modified BSD-style license LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" -DEPENDS = "libgps24" -RDEPENDS_${PN} = "libgps24" -PR = "r12" +DEPENDS = "gpsd" +RDEPENDS_${PN} = "gpsd" -SRCREV = "v${PV}" +PR = "r24" +SRCREV = "dea57d6f29246434173c33c56850708c51fc5b23" -SRC_URI = "git://github.com/Lora-net/lora_gateway.git;protocol=git \ - file://lora-gateway-add-fpga-version-28-31-33.patch \ +SRC_URI = "git://git@gitlab.multitech.net/lora_enterprise/lora_gateway_mtac_full.git;protocol=ssh;branch=master \ file://library_4.0.cfg \ - file://lora-gateway-add-spi-path-function.patch \ file://ln-lora-spi-dev.sh \ - file://lora-gateway-change-util-tx-continuous-clksrc.patch \ - file://lora-gateway-v28-skip-IQ-invert.patch \ - file://lora-gateway-spectral-scan-skip-fpga-reset.patch \ - file://lora-gateway-gpsd.patch \ " -SRC_URI[md5sum] = "9e06a3733a9fea39a3d61f77b412badf" -SRC_URI[sha256sum] = "28fbfe098013908794b32e51d1fed4427f20dd6c8adbbca78df2e1800f5c84dc" S = "${WORKDIR}/git" @@ -74,4 +66,3 @@ FILES_${PN}-staticdev = "${libdir}/lora/libloragw.a" do_rm_work() { echo "skipping" } - diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init index b619d8c..e226669 100755 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init @@ -205,7 +205,7 @@ do_start() { if [ "$no_lora_hw" != "true" ]; then # start packet forwarder - sleep 4 + sleep 2 /usr/sbin/start-stop-daemon --chdir $run_dir/1 --start --background --make-pidfile \ --pidfile $pkt_fwd_pidfile --startas /bin/bash \ -- -c "exec $angel $pkt_fwd $pkt_fwd_options 2>&1" diff --git a/recipes-connectivity/lora/lora-network-server_2.2.42.bb b/recipes-connectivity/lora/lora-network-server_2.2.42.bb new file mode 100644 index 0000000..d52aaac --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server_2.2.42.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "MultiTech LoRa Network Server" +PRIORITY = "optional" +SECTION = "console/utils" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2b9a30a3082ddccd2c695a4dbeeab80d" +DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls" +RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash lora-logging" +PR = "r0" +CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server" + +SRC_URI = "http://multitech.net/downloads/lora-network-server_${PV}.tar.gz \ + file://lora-network-server.init \ + file://lora-network-server.default \ + " + +SRC_URI[md5sum] = "f619c75353fa00aa35628994dbb6c0ff" +SRC_URI[sha256sum] = "f963a83d44f5aec543ccc3a6574e6ef132c6751a003401401c50e3acbd9b378b" + +# 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" + +NETWORK_SERVER_VERSION_mtbsp-at91 = "4" +NETWORK_SERVER_VERSION_mtbsp-ti = "5" +NS_ARCH_mtbsp-at91 = "" +NS_ARCH_mtbsp-ti = "armv7ahf-" + +do_install() { + install -d ${D}${LORA_DIR} + install -m 0755 lora-network-server-${NS_ARCH}mlinux-${NETWORK_SERVER_VERSION} ${D}${LORA_DIR}/lora-network-server + install -m 0755 lora-v21-keygen ${D}${LORA_DIR}/lora-v21-keygen + install -m 0644 config/lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample + install -m 0644 config/lora-network-server.conf.full ${D}${LORA_DIR}/lora-network-server.conf.full + + 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 +} + +FILES_${PN} += "${LORA_DIR}" +FILES_${PN}-dbg += "${LORA_DIR}/.debug" 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 fa5232a..b42bd31 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 @@ -41,6 +41,9 @@ do_compile() { } do_install() { +} + +do_install_append_mtcdt() { install -d ${D}${LORA_DIR} install -m 755 mlinux4/pkt_forwarder ${D}${LORA_DIR}/ install -m 755 ${WORKDIR}/global_conf.json.MTAC_LORA_2_1* ${D}${LORA_DIR}/ 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 ca061da..864b1d2 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb @@ -5,13 +5,14 @@ SECTION = "console/utils" # Semtech license is a modified BSD-style license LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" -DEPENDS = "lora-gateway logrotate lora-logging" +DEPENDS = "lora-gateway logrotate lora-logging gpsd" RDEPENDS_${PN} += "bash" -PR = "r19" -SRCREV = "v${PV}" +PR = "r23" +SRCREV = "28b9dff2eb06fb88421cf32771d380a178079fce" -SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \ + +SRC_URI = "git://git@gitlab.multitech.net/lora_enterprise/packet_forwarder_mtac_full.git;protocol=ssh;branch=master \ file://README.md \ file://lora-packet-forwarder.init \ file://lora-packet-forwarder.default \ @@ -35,12 +36,6 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \ file://global_conf.json.3.1.0.MTCAP-LORA-1-5.KR920-LBT.basic \ file://global_conf.json.3.1.0.MTCAP-LORA-1-5.RU864.basic \ file://local_conf.json \ - file://lora-packet-forwarder-add-spi-dev-path.patch \ - file://lora-packet-forwarder-remove-jit-power-check.patch \ - file://lora-packet-forwarder-gpsd.patch \ - file://lora-packet-forwarder-beacon-rfu-fix.patch \ - file://lora-packet-forwarder-jit-queue-increase-peek-and-remove-sort-from-dequeue.patch \ - file://lora-packet-forwarder-dedup-rx.patch \ " @@ -102,6 +97,7 @@ do_install_append_mtcap() { install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.IN865.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.IN865 } + FILES_${PN} += "${LORA_DIR}" FILES_${PN}-dbg += "${LORA_DIR}/.debug ${LORA_DIR}/forwarder-utils/.debug" diff --git a/recipes-connectivity/lora/lora-query/Makefile b/recipes-connectivity/lora/lora-query/Makefile new file mode 100644 index 0000000..2079a0d --- /dev/null +++ b/recipes-connectivity/lora/lora-query/Makefile @@ -0,0 +1,75 @@ + +includedir ?= /usr/include +libdir ?= /usr/lib + +CFLAGS += + +LIBS := -lmts -ljsoncpp -lpthread + +OBJS += \ +Version.o \ +main.o + +CPP_DEPS += \ +Version.d \ +main.d + + +all: postbuild + +prebuild: + @echo PRE-BUILD + @echo 'Removing previous version components started' + -$(RM) Version.o + -$(RM) Version.d + -$(RM) Version.cpp + @echo 'Removing previous version components complete' + @echo ' ' + +postbuild: mainbuild + @echo POST-BUILD + @echo ' ' + +mainbuild: prebuild + @echo MAIN-BUILD + @$(MAKE) --no-print-directory target + +target: $(OBJS) + @echo 'Building target: $@' + $(CXX) $(CFLAGS) $(LDFLAGS) -o lora-query $(OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + +Version.o: Version.cpp + @echo 'Building file: $<' + $(CXX) $(CFLAGS) -Iinclude -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + +Version.cpp: + @echo 'Creating file: Version.cpp' + /bin/echo -e "//Pre-Build Auto-Generated Source\n#include \"Version.h\"\n\nconst std::string Version::version(\"$(shell git describe)\");" > Version.cpp + @echo 'Finished creating: Version.cpp' + @echo ' ' + +main.o: main.cpp + @echo 'Building file: $<' + $(CXX) $(CFLAGS) -I=$(includedir)/jsoncpp -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + +install: + install -d $(DESTDIR)/usr/bin + install -m 0755 lora-query $(DESTDIR)/usr/bin + +strip: + $(STRIP) lora-query + +clean: + -$(RM) $(OBJS) $(CPP_DEPS) lora-query + -@echo ' ' + +.PHONY: all clean dependents install strip target +.SECONDARY: + + diff --git a/recipes-connectivity/lora/lora-query_1.0.4.bb b/recipes-connectivity/lora/lora-query_1.0.4.bb index 730266f..60bcc42 100644 --- a/recipes-connectivity/lora/lora-query_1.0.4.bb +++ b/recipes-connectivity/lora/lora-query_1.0.4.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.multitech.net/" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "jsoncpp libmts" -PR = "r1" +RDEPENDS_${PN} += "jsoncpp" +PR = "r2" SRCREV = "${PV}" |