diff options
Diffstat (limited to 'recipes-connectivity')
18 files changed, 528 insertions, 17 deletions
diff --git a/recipes-connectivity/hostapd/hostapd_%.bbappend b/recipes-connectivity/hostapd/hostapd_%.bbappend index c8f8fab..d14587a 100644 --- a/recipes-connectivity/hostapd/hostapd_%.bbappend +++ b/recipes-connectivity/hostapd/hostapd_%.bbappend @@ -1,16 +1,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -PR = "m2" - -do_install_append() { - install -d ${D}{sysconfdir}/modprobe.d - install -m 644 -D ${WORKDIR}/cfg80211.conf ${D}${sysconfdir}/modprobe.d/cfg80211.conf -} +# cfg80211 should be configured when loading wifi +# modules using a regulatory database, not here. +PR = "m3" # -p option is striplevel -SRC_URI += " file://cfg80211.conf \ - file://WiFi-SSID \ +SRC_URI += " file://WiFi-SSID \ file://setchan \ file://default \ file://init \ @@ -26,7 +22,6 @@ do_install() { install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd install -m 755 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd - install -m 644 -D ${WORKDIR}/cfg80211.conf ${D}${sysconfdir}/modprobe.d/cfg80211.conf install -d ${D}/usr/share/hostapd install -m 0444 ${WORKDIR}/WiFi-SSID ${D}/usr/share/hostapd/WiFi-SSID.patch install -d ${D}/usr/local/bin diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/lora-basic-station.default b/recipes-connectivity/lora/lora-basic-station-sx1303/lora-basic-station.default new file mode 100644 index 0000000..0f92640 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/lora-basic-station.default @@ -0,0 +1,2 @@ +# set to "yes" or "no" to control starting on boot +ENABLED="no" diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/lora-basic-station.init b/recipes-connectivity/lora/lora-basic-station-sx1303/lora-basic-station.init new file mode 100755 index 0000000..7ebeea2 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/lora-basic-station.init @@ -0,0 +1,158 @@ +#!/bin/bash + + +NAME="lora-basic-station" +ENABLED="yes" + + +[ -f /etc/default/$NAME ] && source /etc/default/$NAME + +run_dir=/var/run/lora +opt_conf_dir=/opt/lora +conf_dir=/var/config/lora +conf_file=$conf_dir/station.conf +tc_uri_file=$conf_dir/tc.uri +tc_key_file=$conf_dir/tc.key +tc_trust_file=$conf_dir/tc.trust + +pkt_fwd=$run_dir/1/station +pkt_fwd_pidfile=$run_dir/station.pid + +port1=/sys/devices/platform/mts-io/ap1 +port2=/sys/devices/platform/mts-io/ap2 + +lora_mtac_id="MTAC-LORA" +lora_1_0_hw="MTAC-LORA-1.0" +lora_1_5_h_hw="MTAC-LORA-1.5" +lora_2_1_hw="MTAC-LORA-2.1" + +lora_mtac_id="MTAC-LORA" +lora_mtac_id915="MTAC-LORA-915" +lora_mtac_id868="MTAC-LORA-868" +lora_mtac_h_id915="MTAC-LORA-H-915" +lora_mtac_h_id868="MTAC-LORA-H-868" + +lora_mtcap_id="MTCAP-LORA" +lora_mtcap_id868="MTCAP-LORA-868" +lora_mtcap_id915="MTCAP-LORA-915" + +lora_mtac_g_id="MTAC-LORA-G" +lora_mtac_g16_id868="MTAC-LORA-G16-868" +lora_mtac_g16_id915="MTAC-LORA-G16-915" +lora_mtac_g64_id868="MTAC-LORA-G64-868" +lora_mtac_g64_id915="MTAC-LORA-G64-915" + +pkt_fwd_options="" + +gps_path="/dev/gps0" + +read_lora_hw_info() { + lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null) + lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null) + lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null) + lora_eui_raw=${lora_eui//:/} +} + +hardware_found() { + if [[ "$lora_id" =~ "$lora_mtac_g_id" ]]; then + setup_mtcdt_2_1 + elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then + setup_mtcap + elif [[ "$lora_id" =~ "$lora_mtac_id" ]]; then + setup_mtcdt + else + return 1 + fi + return 0 +} + +setup_mtcdt() { + ln -sf /opt/lora/station $pkt_fwd +} + +setup_mtcap() { + ln -sf /opt/lora/station $pkt_fwd +} + +setup_mtcdt_2_1() { + echo LORA-2.1 not supported + return 1 +} + +do_start() { + + mkdir -p $run_dir/1 + rm -rf $run_dir/1/* + + read_lora_hw_info + + if hardware_found; then + echo "Found $lora_id with $lora_hw hardware. Configuring" + else + echo "$0: LORA card not detected" + exit 1 + fi + + if ! [ -f $conf_file ]; then + echo "$0: $conf_file missing" + exit 1 + fi + + # + # copy conf files to the run directory + # + cp $conf_file $run_dir/1/ + cp $tc_uri_file $run_dir/1/ + cp $tc_key_file $run_dir/1/ + cp $tc_trust_file $run_dir/1/ + + sed -i.bak "s/\(.*routerid\"\s*\:\s*\"\)<.*>[^\"]*\(.*\)/\1${lora_eui_raw}\2/g" /var/run/lora/1/station.conf + + # + # start packet forwarder + # + echo -n "Starting $NAME: " + + /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \ + --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options" + + renice -n -20 -p $(pgrep $(basename $pkt_fwd)) + + echo "OK" +} + + +do_stop() { + echo -n "Stopping $NAME: " + start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5 + rm -f $pkt_fwd_pidfile + echo "OK" +} + + +if [ "$ENABLED" != "yes" ]; then + echo "$NAME: disabled in /etc/default" + exit +fi + + +case "$1" in + "start") + do_start + ;; + "stop") + do_stop + ;; + "restart") + ## Stop the service and regardless of whether it was + ## running or not, start it again. + do_stop + do_start + ;; + *) + ## If no parameters are given, print which are avaiable. + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/mtcap3-station.conf.E00 b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcap3-station.conf.E00 new file mode 100644 index 0000000..95da968 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcap3-station.conf.E00 @@ -0,0 +1,47 @@ +{ + "SX1301_conf": { + "chan_FSK": {"bandwidth": 125000,"datarate": 50000,"enable": true,"if": 300000,"radio": 0}, + "chan_Lora_std": {"bandwidth": 250000,"enable": true,"if": -200000,"radio": 0,"spread_factor": 7}, + "chan_multiSF_0": {"enable": true,"if": -400000,"radio": 0}, + "chan_multiSF_1": {"enable": true,"if": -200000,"radio": 0}, + "chan_multiSF_2": {"enable": true,"if": 0,"radio": 0}, + "chan_multiSF_3": {"enable": true,"if": -400000,"radio": 1}, + "chan_multiSF_4": {"enable": true,"if": -200000,"radio": 1}, + "chan_multiSF_5": {"enable": true,"if": 0,"radio": 1}, + "chan_multiSF_6": {"enable": true,"if": 200000,"radio": 1}, + "chan_multiSF_7": {"enable": true,"if": 400000,"radio": 1}, + "clksrc": 0, + "device": "/dev/spidev0.0", + "lorawan_public": true, + "pps": true, + "radio_0": {"enable": true,"freq": 868500000,"rssi_offset": -214.5,"tx_enable": true,"type": "SX1250"}, + "radio_1": {"enable": true,"freq": 867500000,"rssi_offset": -214.5,"tx_enable": false,"type": "SX1250"}, + "tx_gain_lut":[ + {"rf_power": 10, "pa_gain": 0, "pwr_idx": 12}, + {"rf_power": 11, "pa_gain": 0, "pwr_idx": 13}, + {"rf_power": 12, "pa_gain": 0, "pwr_idx": 14}, + {"rf_power": 13, "pa_gain": 0, "pwr_idx": 15}, + {"rf_power": 14, "pa_gain": 0, "pwr_idx": 16}, + {"rf_power": 16, "pa_gain": 0, "pwr_idx": 17}, + {"rf_power": 17, "pa_gain": 1, "pwr_idx": 0}, + {"rf_power": 18, "pa_gain": 1, "pwr_idx": 1}, + {"rf_power": 19, "pa_gain": 1, "pwr_idx": 2}, + {"rf_power": 21, "pa_gain": 1, "pwr_idx": 4}, + {"rf_power": 22, "pa_gain": 1, "pwr_idx": 5}, + {"rf_power": 23, "pa_gain": 1, "pwr_idx": 6}, + {"rf_power": 24, "pa_gain": 1, "pwr_idx": 7}, + {"rf_power": 25, "pa_gain": 1, "pwr_idx": 8}, + {"rf_power": 26, "pa_gain": 1, "pwr_idx": 11}, + {"rf_power": 27, "pa_gain": 1, "pwr_idx": 14} + ] + }, + "station_conf": { + "TC_TIMEOUT": "2s", + "euiprefix": "::0", + "log_file": "stderr", + "log_level": "INFO", + "log_rotate": 3, + "log_size": 100000, + "routerid": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>" + } +} diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/mtcap3-station.conf.U00 b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcap3-station.conf.U00 new file mode 100644 index 0000000..a97fdc0 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcap3-station.conf.U00 @@ -0,0 +1,47 @@ +{ + "SX1301_conf": { + "chan_FSK": {"bandwidth": 125000,"datarate": 50000,"enable": false,"if": 300000,"radio": 0}, + "chan_Lora_std": {"bandwidth": 500000,"enable": true,"if": 300000,"radio": 0,"spread_factor": 8}, + "chan_multiSF_0": {"enable": true,"if": -400000,"radio": 0}, + "chan_multiSF_1": {"enable": true,"if": -200000,"radio": 0}, + "chan_multiSF_2": {"enable": true,"if": 0,"radio": 0}, + "chan_multiSF_3": {"enable": true,"if": 200000,"radio": 0}, + "chan_multiSF_4": {"enable": true,"if": -400000,"radio": 1}, + "chan_multiSF_5": {"enable": true,"if": -200000,"radio": 1}, + "chan_multiSF_6": {"enable": true,"if": 0,"radio": 1}, + "chan_multiSF_7": {"enable": true,"if": 200000,"radio": 1}, + "clksrc": 0, + "device": "/dev/spidev0.0", + "lorawan_public": true, + "pps": true, + "radio_0": {"enable": true,"freq": 902700000,"rssi_offset": -214.5,"tx_enable": true,"type": "SX1250"}, + "radio_1": {"enable": true,"freq": 903500000,"rssi_offset": -214.5,"tx_enable": false,"type": "SX1250"}, + "tx_gain_lut":[ + {"rf_power": 11, "pa_gain": 0, "pwr_idx": 14}, + {"rf_power": 12, "pa_gain": 0, "pwr_idx": 15}, + {"rf_power": 13, "pa_gain": 0, "pwr_idx": 16}, + {"rf_power": 15, "pa_gain": 0, "pwr_idx": 17}, + {"rf_power": 16, "pa_gain": 0, "pwr_idx": 18}, + {"rf_power": 17, "pa_gain": 0, "pwr_idx": 19}, + {"rf_power": 18, "pa_gain": 0, "pwr_idx": 20}, + {"rf_power": 19, "pa_gain": 1, "pwr_idx": 3}, + {"rf_power": 20, "pa_gain": 1, "pwr_idx": 4}, + {"rf_power": 21, "pa_gain": 1, "pwr_idx": 5}, + {"rf_power": 22, "pa_gain": 1, "pwr_idx": 6}, + {"rf_power": 23, "pa_gain": 1, "pwr_idx": 7}, + {"rf_power": 24, "pa_gain": 1, "pwr_idx": 8}, + {"rf_power": 25, "pa_gain": 1, "pwr_idx": 10}, + {"rf_power": 26, "pa_gain": 1, "pwr_idx": 12}, + {"rf_power": 27, "pa_gain": 1, "pwr_idx": 15} + ] + }, + "station_conf": { + "TC_TIMEOUT": "2s", + "euiprefix": "::0", + "log_file": "stderr", + "log_level": "INFO", + "log_rotate": 3, + "log_size": 100000, + "routerid": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>" + } +} diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/mtcdt-station.conf.E00 b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcdt-station.conf.E00 new file mode 100644 index 0000000..95da968 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcdt-station.conf.E00 @@ -0,0 +1,47 @@ +{ + "SX1301_conf": { + "chan_FSK": {"bandwidth": 125000,"datarate": 50000,"enable": true,"if": 300000,"radio": 0}, + "chan_Lora_std": {"bandwidth": 250000,"enable": true,"if": -200000,"radio": 0,"spread_factor": 7}, + "chan_multiSF_0": {"enable": true,"if": -400000,"radio": 0}, + "chan_multiSF_1": {"enable": true,"if": -200000,"radio": 0}, + "chan_multiSF_2": {"enable": true,"if": 0,"radio": 0}, + "chan_multiSF_3": {"enable": true,"if": -400000,"radio": 1}, + "chan_multiSF_4": {"enable": true,"if": -200000,"radio": 1}, + "chan_multiSF_5": {"enable": true,"if": 0,"radio": 1}, + "chan_multiSF_6": {"enable": true,"if": 200000,"radio": 1}, + "chan_multiSF_7": {"enable": true,"if": 400000,"radio": 1}, + "clksrc": 0, + "device": "/dev/spidev0.0", + "lorawan_public": true, + "pps": true, + "radio_0": {"enable": true,"freq": 868500000,"rssi_offset": -214.5,"tx_enable": true,"type": "SX1250"}, + "radio_1": {"enable": true,"freq": 867500000,"rssi_offset": -214.5,"tx_enable": false,"type": "SX1250"}, + "tx_gain_lut":[ + {"rf_power": 10, "pa_gain": 0, "pwr_idx": 12}, + {"rf_power": 11, "pa_gain": 0, "pwr_idx": 13}, + {"rf_power": 12, "pa_gain": 0, "pwr_idx": 14}, + {"rf_power": 13, "pa_gain": 0, "pwr_idx": 15}, + {"rf_power": 14, "pa_gain": 0, "pwr_idx": 16}, + {"rf_power": 16, "pa_gain": 0, "pwr_idx": 17}, + {"rf_power": 17, "pa_gain": 1, "pwr_idx": 0}, + {"rf_power": 18, "pa_gain": 1, "pwr_idx": 1}, + {"rf_power": 19, "pa_gain": 1, "pwr_idx": 2}, + {"rf_power": 21, "pa_gain": 1, "pwr_idx": 4}, + {"rf_power": 22, "pa_gain": 1, "pwr_idx": 5}, + {"rf_power": 23, "pa_gain": 1, "pwr_idx": 6}, + {"rf_power": 24, "pa_gain": 1, "pwr_idx": 7}, + {"rf_power": 25, "pa_gain": 1, "pwr_idx": 8}, + {"rf_power": 26, "pa_gain": 1, "pwr_idx": 11}, + {"rf_power": 27, "pa_gain": 1, "pwr_idx": 14} + ] + }, + "station_conf": { + "TC_TIMEOUT": "2s", + "euiprefix": "::0", + "log_file": "stderr", + "log_level": "INFO", + "log_rotate": 3, + "log_size": 100000, + "routerid": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>" + } +} diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/mtcdt-station.conf.U00 b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcdt-station.conf.U00 new file mode 100644 index 0000000..a97fdc0 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/mtcdt-station.conf.U00 @@ -0,0 +1,47 @@ +{ + "SX1301_conf": { + "chan_FSK": {"bandwidth": 125000,"datarate": 50000,"enable": false,"if": 300000,"radio": 0}, + "chan_Lora_std": {"bandwidth": 500000,"enable": true,"if": 300000,"radio": 0,"spread_factor": 8}, + "chan_multiSF_0": {"enable": true,"if": -400000,"radio": 0}, + "chan_multiSF_1": {"enable": true,"if": -200000,"radio": 0}, + "chan_multiSF_2": {"enable": true,"if": 0,"radio": 0}, + "chan_multiSF_3": {"enable": true,"if": 200000,"radio": 0}, + "chan_multiSF_4": {"enable": true,"if": -400000,"radio": 1}, + "chan_multiSF_5": {"enable": true,"if": -200000,"radio": 1}, + "chan_multiSF_6": {"enable": true,"if": 0,"radio": 1}, + "chan_multiSF_7": {"enable": true,"if": 200000,"radio": 1}, + "clksrc": 0, + "device": "/dev/spidev0.0", + "lorawan_public": true, + "pps": true, + "radio_0": {"enable": true,"freq": 902700000,"rssi_offset": -214.5,"tx_enable": true,"type": "SX1250"}, + "radio_1": {"enable": true,"freq": 903500000,"rssi_offset": -214.5,"tx_enable": false,"type": "SX1250"}, + "tx_gain_lut":[ + {"rf_power": 11, "pa_gain": 0, "pwr_idx": 14}, + {"rf_power": 12, "pa_gain": 0, "pwr_idx": 15}, + {"rf_power": 13, "pa_gain": 0, "pwr_idx": 16}, + {"rf_power": 15, "pa_gain": 0, "pwr_idx": 17}, + {"rf_power": 16, "pa_gain": 0, "pwr_idx": 18}, + {"rf_power": 17, "pa_gain": 0, "pwr_idx": 19}, + {"rf_power": 18, "pa_gain": 0, "pwr_idx": 20}, + {"rf_power": 19, "pa_gain": 1, "pwr_idx": 3}, + {"rf_power": 20, "pa_gain": 1, "pwr_idx": 4}, + {"rf_power": 21, "pa_gain": 1, "pwr_idx": 5}, + {"rf_power": 22, "pa_gain": 1, "pwr_idx": 6}, + {"rf_power": 23, "pa_gain": 1, "pwr_idx": 7}, + {"rf_power": 24, "pa_gain": 1, "pwr_idx": 8}, + {"rf_power": 25, "pa_gain": 1, "pwr_idx": 10}, + {"rf_power": 26, "pa_gain": 1, "pwr_idx": 12}, + {"rf_power": 27, "pa_gain": 1, "pwr_idx": 15} + ] + }, + "station_conf": { + "TC_TIMEOUT": "2s", + "euiprefix": "::0", + "log_file": "stderr", + "log_level": "INFO", + "log_rotate": 3, + "log_size": 100000, + "routerid": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>" + } +} diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/setup.gmk b/recipes-connectivity/lora/lora-basic-station-sx1303/setup.gmk new file mode 100644 index 0000000..72450ee --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/setup.gmk @@ -0,0 +1,91 @@ +# -*- makefile -*- + +# Top dir of s2core +# - override accordingly in makefile including this setup.gmk + +platform ?= mlinux +variant ?= sx1303 + + +ARCH ?= +CROSS_COMPILE ?= +export + +# TOOLPREFIX=${CROSS_COMPILE} + + +BD=build-${platform}-${variant} + +# -- Architecture specific +CFG.arm-linux-gnueabihf = mlinux +# CFG.x86_64-linux-gnu = linux + +# -- Variant specific +# testsim runs libloragw inside master process +# testms uses a master slave model +#CFG.testsim = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_lgw +#CFG.testms = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_master_slave +#CFG.testfs = logini_lvl=DEBUG selftests tlsdebug lgwsim ral_lgw +#CFG.testpin = logini_lvl=INFO tlsdebug ral_lgw testpin +#CFG.std = logini_lvl=INFO tlsdebug ral_lgw +#CFG.stdn = logini_lvl=INFO tlsdebug ral_master_slave +#CFG.debug = logini_lvl=DEBUG selftests tlsdebug ral_lgw +#CFG.debugn = logini_lvl=DEBUG selftests tlsdebug ral_master_slave + +# -- Platform specific +CFG.linux = linux lgw1 no_leds +CFG.rpi = linux lgw1 no_leds +CFG.kerlink = linux lgw1 no_leds +CFG.mlinux = linux no_leds ral_lgw prod sx1302 lgw1 usegpsd + +SD.default = src-linux + +SD = $(or ${SD.${platform}}, ${SD.default}) + +UTILS.linux = mtuns + +UTILS = $(or ${UTILS.${platform}}, ${UTILS.default}) + +PERSO.default = +PERSO = $(or ${PERSO.${platform}}, ${PERSO.default}) +PERSOH = $(if ${PERSO},perso.h,) + +# Paths to dependencies +MBEDLIBS = -lmbedtls -lmbedx509 -lmbedcrypto + +# -lm: Needed for lgw which uses pow/ceil +ifneq (minihub,$(platform)) +SYSLIBS = -lm +endif + +CFLAGS.linux.testsim = -g -O0 --coverage +CFLAGS.linux.testms = -g -O0 --coverage +CFLAGS.linux.testfs = -g -O0 --coverage +CFLAGS.linux.testpin = -g -O3 +CFLAGS.linux.std = -g -O3 +CFLAGS.mlinux.std = -g -O3 + +LIBS.mlinux = -lloragw ${MBEDLIBS} -lrt -lm -lpthread -lgps +LIBS.linux = -llgw ${MBEDLIBS} -lpthread +LIBS.rpi = -llgw ${MBEDLIBS} -lpthread +LIBS.kerlink = -llgw ${MBEDLIBS} -lrt -lpthread + +xCFG = ${CFG.${ARCH}} ${CFG.${platform}} ${CFG.${variant}} ${CFG.${platform}.${variant}} +xCFLAGS = ${CFLAGS.${ARCH}} ${CFLAGS.${platform}} ${CFLAGS.${variant}} ${CFLAGS.${platform}.${variant}} +xINCS = ${INCS.${ARCH}} ${INCS.${platform}} ${INCS.${variant}} +xLDFLAGS = ${LDFLAGS.${ARCH}} ${LDFLAGS.${platform}} ${LDFLAGS.${variant}} +xLIBS = ${LIBS.${ARCH}} ${LIBS.${platform}} ${LIBS.${variant}} +xFILES = ${FILES.${ARCH}} ${FILES.${platform}} ${FILES.${variant}} +xOCFLAGS = ${OCFLAGS.${ARCH}} ${OCFLAGS.${platform}} ${OCFLAGS.${variant}} + +DEFS = -DCFG_platform_${platform} -DCFG_platform=\"${platform}\" -DCFG_variant_${variant} -DCFG_variant=\"${variant}\" +DEFS += -DCFG_bdate='"$(shell date -u '+%Y-%m-%d %H:%M:%S')"' +DEFS += -DCFG_version='"$(shell if [ -f ${TD}/VERSION.txt ]; then cat ${TD}/VERSION.txt; else git describe --tag; fi)(${platform}/${variant})"' +DEFS += -DCFG_commit='"$(shell if git rev-parse --git-dir >/dev/null 2>&1; then git rev-parse --short HEAD; else echo -; fi)"' +DEFS += ${xCFG:%=-DCFG_%} +INCS = ${VPATH:%=-I%} -I ${TD}/${BD}/include ${xINCS} +CFLAGS += -std=gnu11 ${INCS} ${DEFS} ${xCFLAGS} ${MORECFLAGS} +LDFLAGS += -L ${TD}/${BD}/lib ${xLDFLAGS} +LIBS = ${xLIBS} ${SYSLIBS} +FILES = ${xFILES} +OCFLAGS = ${xOCFLAGS} diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303/tc.uri b/recipes-connectivity/lora/lora-basic-station-sx1303/tc.uri new file mode 100644 index 0000000..62ad13e --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303/tc.uri @@ -0,0 +1 @@ +wss://127.0.0.1:9002 diff --git a/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-11.bb b/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-11.bb new file mode 100644 index 0000000..4e48df3 --- /dev/null +++ b/recipes-connectivity/lora/lora-basic-station-sx1303_2.0.6-11.bb @@ -0,0 +1,73 @@ +DESCRIPTION = "LoRa Basic Station" +HOMEPAGE = "https://github.com/lorabasics/basicstation" +PRIORITY = "optional" +SECTION = "console/utils" +# Semtech license is a modified BSD-style license +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE;md5=26699ffb0048fefa02c871c2485867ee" +DEPENDS = "lora-gateway-sx1303 logrotate lora-logging mbedtls gpsd" +RDEPENDS_${PN} += "bash" +PR = "r4" + +# SRCREV = "9bf824154731cbe78366cbffa1b0c6bd0354b66f" +SRCREV = "${PV}" + +SRC_URI = "git://github.com/MultiTechSystems/basicstation.git;protocol=https;branch=master; \ + file://setup.gmk \ + file://lora-basic-station.init \ + file://lora-basic-station.default \ + file://tc.uri \ + file://mtcap3-station.conf.E00 \ + file://mtcap3-station.conf.U00 \ + file://mtcdt-station.conf.E00 \ + file://mtcdt-station.conf.U00 \ +" + +S = "${WORKDIR}/git" +B = "${S}" + +LORA_DIR = "/opt/lora" + +export LGW_PATH = "${STAGING_LIBDIR}/lora" +export LGW_INC = "${STAGING_INCDIR}/lora" + +CFLAGS += "-isystem =/usr/include/gps -DNODEBUG -I${STAGING_INCDIR} -I${WORKDIR}/git/libtools -I${STAGING_INCDIR}/lora -I${STAGING_INCDIR}/lora/lgw-sx1303 -I${WORKDIR}/git/deps -Iinc -I. -std=gnu11 -L${WORKDIR}/git/libtools -L${STAGING_LIBDIR}/lora/lgw-sx1303/lgw/ -L${STAGING_LIBDIR}/lora" + +do_compile() { + cp ${WORKDIR}/setup.gmk ${S}/setup.gmk + oe_runmake +} + +do_install() { + install -d ${D}${LORA_DIR} + install -m 755 ${S}/build-mlinux-sx1303/bin/station ${D}${LORA_DIR}/station-sx1303 +} + +do_install_append_mtcdt() { + install -d ${D}${LORA_DIR} + install -m 755 ${WORKDIR}/mtcdt-station.conf.E00 ${D}${LORA_DIR}/station-sx1303.conf + install -m 755 ${WORKDIR}/mtcdt-station.conf.E00 ${D}${LORA_DIR}/station-sx1303.conf.E00 + install -m 755 ${WORKDIR}/mtcdt-station.conf.U00 ${D}${LORA_DIR}/station-sx1303.conf.U00 +} + +do_install_append_mtcpmhs() { + install -d ${D}${LORA_DIR} + install -m 755 ${WORKDIR}/mtcdt-station.conf.E00 ${D}${LORA_DIR}/station-sx1303.conf + install -m 755 ${WORKDIR}/mtcdt-station.conf.E00 ${D}${LORA_DIR}/station-sx1303.conf.E00 + install -m 755 ${WORKDIR}/mtcdt-station.conf.U00 ${D}${LORA_DIR}/station-sx1303.conf.U00 +} + +do_install_append_mtcap3() { + install -d ${D}${LORA_DIR} + install -m 755 ${WORKDIR}/mtcap3-station.conf.E00 ${D}${LORA_DIR}/station-sx1303.conf + install -m 755 ${WORKDIR}/mtcap3-station.conf.E00 ${D}${LORA_DIR}/station-sx1303.conf.E00 + install -m 755 ${WORKDIR}/mtcap3-station.conf.U00 ${D}${LORA_DIR}/station-sx1303.conf.U00 +} + + +FILES_${PN} += "${LORA_DIR}" + +# disable this on purpose for dev purposes +do_rm_work() { + echo "skipping" +} diff --git a/recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb b/recipes-connectivity/lora/lora-basic-station_2.0.6-11.bb index 7568330..7568330 100644 --- a/recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb +++ b/recipes-connectivity/lora/lora-basic-station_2.0.6-11.bb diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.31.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.42.bb index 68a6322..68a6322 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.31.bb +++ b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.42.bb diff --git a/recipes-connectivity/lora/lora-gateway_5.0.14.bb b/recipes-connectivity/lora/lora-gateway_5.0.22.bb index d3af872..d3af872 100644 --- a/recipes-connectivity/lora/lora-gateway_5.0.14.bb +++ b/recipes-connectivity/lora/lora-gateway_5.0.22.bb diff --git a/recipes-connectivity/lora/lora-network-server_2.6.2.bb b/recipes-connectivity/lora/lora-network-server_2.6.12.bb index de3b950..de3b950 100644 --- a/recipes-connectivity/lora/lora-network-server_2.6.2.bb +++ b/recipes-connectivity/lora/lora-network-server_2.6.12.bb diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init index 092e0a5..6aaf26f 100755 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init +++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init @@ -203,9 +203,9 @@ setup_mtcap3() { setup_mtcdt() { if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then - ln -sf /dev/spidev32766.2 /dev/spidev0.0 + ln -sf /dev/spidev0.2 /dev/spidev0.0 elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then - ln -sf /dev/spidev32765.2 /dev/spidev0.0 + ln -sf /dev/spidev1.2 /dev/spidev0.0 fi if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.23.bb index 8c70bba..8c70bba 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.22.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.23.bb diff --git a/recipes-connectivity/openssh/openssh-mlinux/sshd_check_keys b/recipes-connectivity/openssh/openssh-mlinux/sshd_check_keys index 4af8d5c..a276b6d 100644 --- a/recipes-connectivity/openssh/openssh-mlinux/sshd_check_keys +++ b/recipes-connectivity/openssh/openssh-mlinux/sshd_check_keys @@ -60,7 +60,7 @@ HOST_KEYS=$(sed -n 's/^[ \t]*HostKey[ \t]\+\(.*\)/\1/p' "${sshd_config}") [ -z "${HOST_KEYS}" ] && HOST_KEYS="$SYSCONFDIR/ssh_host_rsa_key $SYSCONFDIR/ssh_host_dsa_key $SYSCONFDIR/ssh_host_ecdsa_key $SYSCONFDIR/ssh_host_ed25519_key" for key in ${HOST_KEYS} ; do - [ -f $key ] && continue + [ -s $key ] && continue case $key in *_rsa_key) echo " generating ssh RSA host key..." diff --git a/recipes-connectivity/openssh/openssh_8.4p1.bb b/recipes-connectivity/openssh/openssh_8.4p1.bb index 8e73ceb..0cadaf9 100644 --- a/recipes-connectivity/openssh/openssh_8.4p1.bb +++ b/recipes-connectivity/openssh/openssh_8.4p1.bb @@ -8,6 +8,8 @@ SECTION = "console/network" LICENSE = "BSD & ISC & MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=18d9e5a8b3dd1790d73502f50426d4d3" +PR = "r1" + DEPENDS = "zlib openssl virtual/crypt" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -65,9 +67,9 @@ inherit manpages useradd update-rc.d update-alternatives systemd USERADD_PACKAGES = "${PN}-sshd" USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd" -INITSCRIPT_PACKAGES = "${PN}-sshd" -INITSCRIPT_NAME_${PN}-sshd = "sshd" -INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" +INITSCRIPT_PACKAGES = "${PN}-sshd-mlinit" +INITSCRIPT_NAME_${PN}-sshd-mlinit = "sshd" +INITSCRIPT_PARAMS_${PN}-sshd-mlinit = "defaults 9" SYSTEMD_PACKAGES = "${PN}-sshd" SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" @@ -171,10 +173,11 @@ do_install_ptest () { ALLOW_EMPTY_${PN} = "1" -PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" +PACKAGES =+ "${PN}-sshd-mlinit ${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" FILES_${PN}-scp = "${bindir}/scp.${BPN}" FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" -FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" +FILES_${PN}-sshd = "${sbindir}/sshd ${systemd_unitdir}/system" +FILES_${PN}-sshd-mlinit = "${sysconfdir}/init.d/sshd" FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" FILES_${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" FILES_${PN}-sftp = "${bindir}/sftp" |