Update to v3 components + update openembedded layers.

Closes #9.

Author: brocaar

bitbake

@@ -33,6 +33,6 @@ pygmentsUseClasses = true
     weight = 4
 
 [params]
-    raspberrypi_raspberrypi3_version = "2.0.0test4"
-    wifx_lorix_one_sd_version = "2.0.0test4"
-    wifx_lorix_one_512_sd_version = "2.0.0test4"
+    raspberrypi_raspberrypi3_version = "3.0.0test1"
+    wifx_lorix_one_sd_version = "3.0.0test1"
+    wifx_lorix_one_512_sd_version = "3.0.0test1"

docs/config.toml

@@ -8,6 +8,18 @@ menu:
 
 # Changelog
 
+## v3.0.0test1
+
+### General
+
+* LoRa App Server v3.1.0.
+* LoRa Server v3.0.2.
+* LoRa Gateway Bridge v3.0.1.
+
+### Raspberry Pi
+
+* Fix HDMI related boot issue. ([#9](https://github.com/brocaar/lora-gateway-os/issues/9))
+
 ## v2.0.0test4
 
 ### General

docs/content/overview/changelog.md

@@ -9,8 +9,8 @@ SRC_URI = " \
     file://lora-app-server.monit \
     file://lora-app-server.toml \
 "
-SRC_URI[md5sum] = "1b201241a69d1fa660441533fc4bfdde"
-SRC_URI[sha256sum] = "9433b7ca3980e3457d93b2e19d9f0e26530128b0a887df6e566ffc1edae2ac2f"
+SRC_URI[md5sum] = "aa8dc1d2e26c171f2496e7b7dbc948a0"
+SRC_URI[sha256sum] = "8b75522b372d7e37b1168aa9d1de848cdb16b758b694abfbbc8eeeb0b36a8a3e"
 PR = "r1"
 
 inherit update-rc.d

layers/bsp/meta-raspberrypi

@@ -1,96 +1,90 @@
-[general]
-# debug=5, info=4, warning=3, error=2, fatal=1, panic=0
-log_level = 4
-
-
-# Configuration which relates to the packet-forwarder.
-[packet_forwarder]
-# ip:port to bind the UDP listener to
-#
-# Example: 0.0.0.0:1700 to listen on port 1700 for all network interfaces.
-# This is the listeren to which the packet-forwarder forwards its data
-# so make sure the 'serv_port_up' and 'serv_port_down' from your
-# packet-forwarder matches this port.
-udp_bind = "0.0.0.0:1700"
-
-# Skip the CRC status-check of received packets
+# This configuration provides a Semtech UDP packet-forwarder backend and
+# integrates with a MQTT broker. Many options and defaults have been omitted
+# for simplicity.
 #
-# This is only has effect when the packet-forwarder is configured to forward
-# LoRa frames with CRC errors.
-skip_crc_check = false
+# See https://www.loraserver.io/lora-gateway-bridge/install/config/ for a full
+# configuration example and documentation.
 
 
-  # # Managed packet-forwarder configuration.
-  # #
-  # # By configuring one or multiple managed packet-forwarder sections, the
-  # # LoRa Gateway Bridge updates the configuration when the backend receives
-  # # a configuration change, after which it will restart the packet-forwarder.
-  # [[packet_forwarder.configuration]]
-  # # Gateway MAC.
-  # #
-  # # The LoRa Gateway Bridge will only apply the configuration updates for this
-  # # gateway MAC.
-  # mac="0102030405060708"
+# Gateway backend configuration.
+[backend]
+# Backend type.
+type="semtech_udp"
 
-  # # Base configuration file.
-  # #
-  # # This file will be used as base-configuration and will not be overwritten on
-  # # a configuration update. This file needs to exist and contains the base
-  # # configuration and vendor specific
-  # base_file="/etc/lora-packet-forwarder/global_conf.json"
+  # Semtech UDP packet-forwarder backend.
+  [backend.semtech_udp]
 
-  # # Output configuration file.
-  # #
-  # # This will be the final configuration for the packet-forwarder, containing
-  # # a merged version of the base configuration + the requested configuration
-  # # update.
-  # # Warning: this file will be overwritten on a configuration update!
-  # output_file="/etc/lora-packet-forwarder/local_conf.json"
-
-  # # Restart command.
-  # #
-  # # This command is issued by the LoRa Gateway Bridge on a configuration
-  # # change. Make sure the LoRa Gateway Bridge process has sufficient
-  # # permissions to execute this command.
-  # restart_command="/etc/init.d/lora-packet-forwarder restart"
-
-
-# Configuration for the MQTT backend.
-[backend.mqtt]
-# MQTT topic templates for the different MQTT topics.
-#
-# The meaning of these topics are documented at:
-# https://docs.loraserver.io/lora-gateway-bridge/use/data/
-#
-# The default values match the default expected configuration of the
-# LoRa Server MQTT backend. Therefore only change these values when
-# absolutely needed.
-# Use "{{ .MAC }}" as an substitution for the LoRa gateway MAC.
-uplink_topic_template="gateway/{{ .MAC }}/rx"
-downlink_topic_template="gateway/{{ .MAC }}/tx"
-stats_topic_template="gateway/{{ .MAC }}/stats"
-ack_topic_template="gateway/{{ .MAC }}/ack"
-config_topic_template="gateway/{{ .MAC }}/config"
+  # ip:port to bind the UDP listener to
+  #
+  # Example: 0.0.0.0:1700 to listen on port 1700 for all network interfaces.
+  # This is the listeren to which the packet-forwarder forwards its data
+  # so make sure the 'serv_port_up' and 'serv_port_down' from your
+  # packet-forwarder matches this port.
+  udp_bind = "0.0.0.0:1700"
 
+    # Managed packet-forwarder configuration.
+    #
+    # By configuring one or multiple managed packet-forwarder sections, the
+    # LoRa Gateway Bridge updates the configuration when the backend receives
+    # a configuration change, after which it will restart the packet-forwarder.
+    #
+    # Example (this configuration can be repeated):
+    #
+    # [[backend.semtech_udp.configuration]]
+    # # Gateway ID.
+    # #
+    # # The LoRa Gateway Bridge will only apply the configuration updates for this
+    # # gateway ID.
+    # gateway_id="0102030405060708"
+
+    # # Base configuration file.
+    # #
+    # # This file will be used as base-configuration and will not be overwritten on
+    # # a configuration update. This file needs to exist and contains the base
+    # # configuration and vendor specific
+    # base_file="/etc/lora-packet-forwarder/global_conf.json"
+
+    # # Output configuration file.
+    # #
+    # # This will be the final configuration for the packet-forwarder, containing
+    # # a merged version of the base configuration + the requested configuration
+    # # update.
+    # # Warning: this file will be overwritten on a configuration update!
+    # output_file="/etc/lora-packet-forwarder/local_conf.json"
+
+    # # Restart command.
+    # #
+    # # This command is issued by the LoRa Gateway Bridge on a configuration
+    # # change. Make sure the LoRa Gateway Bridge process has sufficient
+    # # permissions to execute this command.
+    # restart_command="/etc/init.d/lora-packet-forwarder restart"
+
+# Integration configuration.
+[integration]
 # Payload marshaler.
 #
 # This defines how the MQTT payloads are encoded. Valid options are:
-# * v2_json:   The default LoRa Gateway Bridge v2 encoding (will be deprecated and removed in LoRa Gateway Bridge v3)
 # * protobuf:  Protobuf encoding (this will become the LoRa Gateway Bridge v3 default)
 # * json:      JSON encoding (easier for debugging, but less compact than 'protobuf')
-marshaler="v2_json"
+marshaler="protobuf"
+
+  # MQTT integration configuration.
+  [integration.mqtt]
+  # Event topic template.
+  event_topic_template="gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+
+  # Command topic template.
+  command_topic_template="gateway/{{ .GatewayID }}/command/#"
 
   # MQTT authentication.
-  [backend.mqtt.auth]
+  [integration.mqtt.auth]
   # Type defines the MQTT authentication type to use.
   #
   # Set this to the name of one of the sections below.
-  # Note: when the 'v2_json marhaler' is configured, the generic backend will
-  # always be used.
   type="generic"
 
     # Generic MQTT authentication.
-    [backend.mqtt.auth.generic]
+    [integration.mqtt.auth.generic]
     # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
     server="tcp://127.0.0.1:1883"
 
@@ -99,60 +93,3 @@ marshaler="v2_json"
 
     # Connect with the given password (optional)
     password=""
-
-    # Quality of service level
-    #
-    # 0: at most once
-    # 1: at least once
-    # 2: exactly once
-    #
-    # Note: an increase of this value will decrease the performance.
-    # For more information: https://www.hivemq.com/blog/mqtt-essentials-part-6-mqtt-quality-of-service-levels
-    qos=0
-
-    # Clean session
-    #
-    # Set the "clean session" flag in the connect message when this client
-    # connects to an MQTT broker. By setting this flag you are indicating
-    # that no messages saved by the broker for this client should be delivered.
-    clean_session=true
-
-    # Client ID
-    #
-    # Set the client id to be used by this client when connecting to the MQTT
-    # broker. A client id must be no longer than 23 characters. When left blank,
-    # a random id will be generated. This requires clean_session=true.
-    client_id=""
-
-    # CA certificate file (optional)
-    #
-    # Use this when setting up a secure connection (when server uses ssl://...)
-    # but the certificate used by the server is not trusted by any CA certificate
-    # on the server (e.g. when self generated).
-    ca_cert=""
-
-    # mqtt TLS certificate file (optional)
-    tls_cert=""
-
-    # mqtt TLS key file (optional)
-    tls_key=""
-
-    # Maximum interval that will be waited between reconnection attempts when connection is lost.
-    # Valid units are 'ms', 's', 'm', 'h'. Note that these values can be combined, e.g. '24h30m15s'.
-    max_reconnect_interval="10m0s"
-
-
-# Metrics configuration.
-[metrics]
-
-  # Metrics stored in Prometheus.
-  #
-  # These metrics expose information about the state of the LoRa Gateway Bridge
-  # instance like number of messages processed, number of function calls, etc.
-  [metrics.prometheus]
-  # Expose Prometheus metrics endpoint.
-  endpoint_enabled=false
-
-  # The ip:port to bind the Prometheus metrics server to for serving the
-  # metrics endpoint.
-  bind=""

layers/loraserver/meta-loraserver/recipes-loraserver/lora-app-server/lora-app-server_2.6.0.bb renamed to layers/loraserver/meta-loraserver/recipes-loraserver/lora-app-server/lora-app-server_3.1.0.bb

@@ -8,8 +8,8 @@ SRC_URI = "https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-ga
            file://lora-gateway-bridge.init \
            file://lora-gateway-bridge.monit \
 "
-SRC_URI[md5sum] = "2847ca47e165e37855ce636fc149ab54"
-SRC_URI[sha256sum] = "a23a20e366c0dc5a0ca4c9df34e5815df4b565cbf534bb3d92d88ae8648dbceb"
+SRC_URI[md5sum] = "8ce5f8d32a0a6b9fba49b38c759f3ed4"
+SRC_URI[sha256sum] = "62fe4da1c9dfe3a0310fc700710610c94b16d33b2f993d0b4ea3f146d5bd7c7e"
 PR = "r1"
 
 inherit update-rc.d

layers/loraserver/meta-loraserver/recipes-loraserver/lora-gateway-bridge/lora-gateway-bridge/lora-gateway-bridge.toml

@@ -25,8 +25,8 @@ SRC_URI = " \
     file://config/us915_6.toml \
     file://config/us915_7.toml \
 "
-SRC_URI[md5sum] = "81d7be439efa9afdfaa1c2def30a2bdb"
-SRC_URI[sha256sum] = "f667fd0f6759b0f325301faa76cf52dd3b184769387334aed9d1b69532012831"
+SRC_URI[md5sum] = "2e5df617f5037b55cca5e17355fec2c5"
+SRC_URI[sha256sum] = "84d595dd4ff8468d2b0835e14f02d226b13fbe7edda20e1abd99df1c3b08daad"
 PR = "r1"
 
 inherit update-rc.d

layers/loraserver/meta-loraserver/recipes-loraserver/lora-gateway-bridge/lora-gateway-bridge_2.7.1.bb renamed to layers/loraserver/meta-loraserver/recipes-loraserver/lora-gateway-bridge/lora-gateway-bridge_3.0.1.bb

@@ -1,6 +1,6 @@
 DISTRO = "lora-gateway-os"
 DISTRO_NAME = "LoRa Gateway OS"
-DISTRO_VERSION = "2.0.0test4"
+DISTRO_VERSION = "3.0.0test1"
 
 PACKAGE_CLASSES = "package_ipk"
 IMAGE_INSTALL_append = " opkg "

layers/loraserver/meta-loraserver/recipes-loraserver/loraserver/loraserver_2.6.1.bb renamed to layers/loraserver/meta-loraserver/recipes-loraserver/loraserver/loraserver_3.0.2.bb

@@ -32,6 +32,7 @@ do_init_postgresql_dbs() {
         sudo -u postgres /usr/bin/psql -c "create database loraserver_ns with owner loraserver_ns";
         sudo -u postgres /usr/bin/psql -c "create database loraserver_as with owner loraserver_as";
         sudo -u postgres /usr/bin/psql loraserver_as -c "create extension pg_trgm;"
+        sudo -u postgres /usr/bin/psql loraserver_as -c "create extension hstore;"
         touch /var/lib/firstbootinit/postgresql_dbs_created
     fi
 }

layers/mender/meta-mender

@@ -13,7 +13,7 @@ do_deploy() {
 }
 
 
-VERSION="2.0.0test4"
+VERSION="3.0.0test1"
 
 do_deploy $VERSION "raspberrypi" "raspberrypi3"
 do_deploy $VERSION "wifx" "lorix-one-sd"