From a680e2f7da74f33c2718222891acdb0b100d8746 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Wed, 22 Mar 2023 20:56:28 -0400 Subject: [PATCH] update README.md for build notes; update dvmhost.service for /usr/local; update CMakeLists.txt for old_install-service to sed replace the appropriate pathing; --- CMakeLists.txt | 4 +++- README.md | 9 +++++++++ linux/dvmhost.service | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f568abc..0391d6c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -530,4 +530,6 @@ add_custom_target(old_install-service COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/rid_acl.dat COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/tg_acl.dat COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/log - COMMAND cp ../linux/dvmhost.service /lib/systemd/system/) + COMMAND cp ../linux/dvmhost.service /lib/systemd/system/ + COMMAND bash \"-c\" \"sed -i 's/\\\\/usr\\\\/local\\\\/bin/\\\\/opt\\\\/dvm\\\\/bin/' /lib/systemd/system/dvmhost.service\" + COMMAND bash \"-c\" \"sed -i 's/\\\\/usr\\\\/local\\\\/etc/\\\\/opt\\\\/dvm/' /lib/systemd/system/dvmhost.service\") diff --git a/README.md b/README.md index 0e461372..ed963341 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ Please note cross-compliation requires you to have the appropriate development p - For old RPi 1 using Debian/Ubuntu OS install the standard ARM embedded toolchain (typically "arm-none-eabi-gcc" and "arm-none-eabi-g++"). 1. Switch to "/opt" and checkout `https://github.com/raspberrypi/tools.git`. +[See build notes](#build-notes). + ### Compiled Protocol Options These are the protocols that are compiled-in to the host for data processing. By default, support for both DMR and P25 protocols are enabled. And, support for the NXDN protocol is disabled. What "compiled-in" support means is whether or not the host will perform _any_ processing for the specified protocol (and this is regardless of whether or not the `config.yml` has a protocol specified for being enabled or not). @@ -124,6 +126,13 @@ usage: ./dvmhost [-vh] [-f] [--cal] [--setup] [-c ] [--remot -- stop handling options ``` +### Build Notes + +- The installation path of "/opt/dvm" is still supported by the CMake Makefile (and will be for the forseeable future); after compiling, in order to install to this path simply use: `make old_install`. +- The installation of the systemd service is also still supported by the CMake Makefile, after using `make old_install`, simply use: `make old_install-service`. + +There is an automated process to generate a tarball package if required as well, after compiling simply run: `make tarball`. This will generate a tarball package, the tarball package contains the similar pathing that the `make old_install` would generate. + ## Notes Security note: It is highly recommended that the REST API interface not be exposed directly to the internet. If such exposure is wanted/needed, it is highly recommended to proxy the dvmhost REST API through a modern web server (like nginx for example) rather then directly exposing dvmhost's REST API port. diff --git a/linux/dvmhost.service b/linux/dvmhost.service index 75666008..e9835916 100644 --- a/linux/dvmhost.service +++ b/linux/dvmhost.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] User=dvmhost Type=forking -ExecStart=/opt/dvm/bin/dvmhost -c /opt/dvm/config.yml +ExecStart=/usr/local/bin/dvmhost -c /usr/local/etc/config.yml Restart=on-abnormal [Install]