From 87b7a7c48a7b8b8942debf6fc4bdf84ef43cc62b Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 18 Jul 2020 17:36:54 +0200 Subject: [PATCH 01/14] Moved existing scripts to pi-star folder --- linux/{ => pi-star}/init/README.md | 0 linux/{ => pi-star}/init/mmdvmhost | 0 linux/{ => pi-star}/systemd/README.md | 0 linux/{ => pi-star}/systemd/mmdvmhost.service | 0 linux/{ => pi-star}/systemd/mmdvmhost.timer | 0 linux/{ => pi-star}/systemd/mmdvmhost_service | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename linux/{ => pi-star}/init/README.md (100%) rename linux/{ => pi-star}/init/mmdvmhost (100%) rename linux/{ => pi-star}/systemd/README.md (100%) rename linux/{ => pi-star}/systemd/mmdvmhost.service (100%) rename linux/{ => pi-star}/systemd/mmdvmhost.timer (100%) rename linux/{ => pi-star}/systemd/mmdvmhost_service (100%) diff --git a/linux/init/README.md b/linux/pi-star/init/README.md similarity index 100% rename from linux/init/README.md rename to linux/pi-star/init/README.md diff --git a/linux/init/mmdvmhost b/linux/pi-star/init/mmdvmhost similarity index 100% rename from linux/init/mmdvmhost rename to linux/pi-star/init/mmdvmhost diff --git a/linux/systemd/README.md b/linux/pi-star/systemd/README.md similarity index 100% rename from linux/systemd/README.md rename to linux/pi-star/systemd/README.md diff --git a/linux/systemd/mmdvmhost.service b/linux/pi-star/systemd/mmdvmhost.service similarity index 100% rename from linux/systemd/mmdvmhost.service rename to linux/pi-star/systemd/mmdvmhost.service diff --git a/linux/systemd/mmdvmhost.timer b/linux/pi-star/systemd/mmdvmhost.timer similarity index 100% rename from linux/systemd/mmdvmhost.timer rename to linux/pi-star/systemd/mmdvmhost.timer diff --git a/linux/systemd/mmdvmhost_service b/linux/pi-star/systemd/mmdvmhost_service similarity index 100% rename from linux/systemd/mmdvmhost_service rename to linux/pi-star/systemd/mmdvmhost_service From 76033dd30174f8c7ab3f4378ca1eecf6556bf287 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 18 Jul 2020 18:07:10 +0200 Subject: [PATCH 02/14] Add systemd unit --- linux/systemd/mmdvmhost.service | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 linux/systemd/mmdvmhost.service diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service new file mode 100644 index 0000000..0587683 --- /dev/null +++ b/linux/systemd/mmdvmhost.service @@ -0,0 +1,12 @@ +[Unit] +Description=MMDVMHost Radio Servce +After=syslog.target network.target + +[Service] +User=mmdvm +Type=forking +ExecStart=/usr/bin/local/MMDVMHost +Restart=on-abnormal + +[Install] +WantedBy=multi-user.target From ba9c97289fbb9b4b800971543bc44be2088dd573 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 18 Jul 2020 18:07:21 +0200 Subject: [PATCH 03/14] add install targets --- Makefile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91fcf2d..ccc4eef 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,31 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h From bb1a542fe1ba0372f1fc7c2a9425cb76c432b52d Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 08:06:29 +0200 Subject: [PATCH 04/14] delete unit file on uninstall --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ccc4eef..96a6b3e 100644 --- a/Makefile +++ b/Makefile @@ -55,10 +55,12 @@ install-service: install /etc/MMDVM.ini @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini @chown mmdvm:mmdvm /etc/MMDVM.ini +.PHONY uninstall-service: uninstall-service: @systemctl stop mmdvmhost.service || true @systemctl disable mmdvmhost.service || true @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h From 49a4e2ad0d5880cced428289ecec45017adf3702 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 08:13:27 +0200 Subject: [PATCH 05/14] fix typo in executable path --- linux/systemd/mmdvmhost.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service index 0587683..7ab6aa1 100644 --- a/linux/systemd/mmdvmhost.service +++ b/linux/systemd/mmdvmhost.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] User=mmdvm Type=forking -ExecStart=/usr/bin/local/MMDVMHost +ExecStart=/usr/local/bin/MMDVMHost Restart=on-abnormal [Install] From fa7be67d9c920aa62f8499b8fe3f7f41cef04c5a Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 08:36:22 +0200 Subject: [PATCH 06/14] Add install service to othe rmakefiles --- Makefile.Pi | 25 ++++++++++++++++++++++++- Makefile.Pi.Adafruit | 25 ++++++++++++++++++++++++- Makefile.Pi.HD44780 | 25 ++++++++++++++++++++++++- Makefile.Pi.OLED | 25 ++++++++++++++++++++++++- Makefile.Pi.PCF8574 | 25 ++++++++++++++++++++++++- 5 files changed, 120 insertions(+), 5 deletions(-) diff --git a/Makefile.Pi b/Makefile.Pi index 62e27aa..7909ef4 100644 --- a/Makefile.Pi +++ b/Makefile.Pi @@ -34,10 +34,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit index 2915c69..9af13af 100644 --- a/Makefile.Pi.Adafruit +++ b/Makefile.Pi.Adafruit @@ -35,10 +35,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780 index c00e58f..eae303b 100644 --- a/Makefile.Pi.HD44780 +++ b/Makefile.Pi.HD44780 @@ -35,10 +35,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED index 41e837e..08ec63f 100644 --- a/Makefile.Pi.OLED +++ b/Makefile.Pi.OLED @@ -35,10 +35,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574 index 37de0b1..4ebf3fc 100644 --- a/Makefile.Pi.PCF8574 +++ b/Makefile.Pi.PCF8574 @@ -36,10 +36,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h From 801ba04e0d7a01ac440142d614eed0e51876ddf3 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 09:08:58 +0200 Subject: [PATCH 07/14] Correct typo --- linux/systemd/mmdvmhost.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service index 7ab6aa1..27ca4ee 100644 --- a/linux/systemd/mmdvmhost.service +++ b/linux/systemd/mmdvmhost.service @@ -1,5 +1,5 @@ [Unit] -Description=MMDVMHost Radio Servce +Description=MMDVMHost Radio Service After=syslog.target network.target [Service] From 8f59691738c2e732925d425b09271b80d32c0550 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 18 Jul 2020 17:36:54 +0200 Subject: [PATCH 08/14] Moved existing scripts to pi-star folder --- linux/{ => pi-star}/init/README.md | 0 linux/{ => pi-star}/init/mmdvmhost | 0 linux/{ => pi-star}/systemd/README.md | 0 linux/{ => pi-star}/systemd/mmdvmhost.service | 0 linux/{ => pi-star}/systemd/mmdvmhost.timer | 0 linux/{ => pi-star}/systemd/mmdvmhost_service | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename linux/{ => pi-star}/init/README.md (100%) rename linux/{ => pi-star}/init/mmdvmhost (100%) rename linux/{ => pi-star}/systemd/README.md (100%) rename linux/{ => pi-star}/systemd/mmdvmhost.service (100%) rename linux/{ => pi-star}/systemd/mmdvmhost.timer (100%) rename linux/{ => pi-star}/systemd/mmdvmhost_service (100%) diff --git a/linux/init/README.md b/linux/pi-star/init/README.md similarity index 100% rename from linux/init/README.md rename to linux/pi-star/init/README.md diff --git a/linux/init/mmdvmhost b/linux/pi-star/init/mmdvmhost similarity index 100% rename from linux/init/mmdvmhost rename to linux/pi-star/init/mmdvmhost diff --git a/linux/systemd/README.md b/linux/pi-star/systemd/README.md similarity index 100% rename from linux/systemd/README.md rename to linux/pi-star/systemd/README.md diff --git a/linux/systemd/mmdvmhost.service b/linux/pi-star/systemd/mmdvmhost.service similarity index 100% rename from linux/systemd/mmdvmhost.service rename to linux/pi-star/systemd/mmdvmhost.service diff --git a/linux/systemd/mmdvmhost.timer b/linux/pi-star/systemd/mmdvmhost.timer similarity index 100% rename from linux/systemd/mmdvmhost.timer rename to linux/pi-star/systemd/mmdvmhost.timer diff --git a/linux/systemd/mmdvmhost_service b/linux/pi-star/systemd/mmdvmhost_service similarity index 100% rename from linux/systemd/mmdvmhost_service rename to linux/pi-star/systemd/mmdvmhost_service From 354e808ccb1a6ea1283a3719c86cc25bc5cb2803 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 18 Jul 2020 18:07:10 +0200 Subject: [PATCH 09/14] Add systemd unit --- linux/systemd/mmdvmhost.service | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 linux/systemd/mmdvmhost.service diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service new file mode 100644 index 0000000..0587683 --- /dev/null +++ b/linux/systemd/mmdvmhost.service @@ -0,0 +1,12 @@ +[Unit] +Description=MMDVMHost Radio Servce +After=syslog.target network.target + +[Service] +User=mmdvm +Type=forking +ExecStart=/usr/bin/local/MMDVMHost +Restart=on-abnormal + +[Install] +WantedBy=multi-user.target From d4e6f2cb5ef3eebc9844d9fb96a61f4935d8e3b8 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 18 Jul 2020 18:07:21 +0200 Subject: [PATCH 10/14] add install targets --- Makefile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2181178..3f298dc 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,31 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h From f64371b4c8e112850c2af0329c56e6742a859d99 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 08:06:29 +0200 Subject: [PATCH 11/14] delete unit file on uninstall --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 3f298dc..df54350 100644 --- a/Makefile +++ b/Makefile @@ -55,10 +55,12 @@ install-service: install /etc/MMDVM.ini @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini @chown mmdvm:mmdvm /etc/MMDVM.ini +.PHONY uninstall-service: uninstall-service: @systemctl stop mmdvmhost.service || true @systemctl disable mmdvmhost.service || true @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h From 869edd33fd17f0421e3ef9cc9e2a2f6c32561fd9 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 08:13:27 +0200 Subject: [PATCH 12/14] fix typo in executable path --- linux/systemd/mmdvmhost.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service index 0587683..7ab6aa1 100644 --- a/linux/systemd/mmdvmhost.service +++ b/linux/systemd/mmdvmhost.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] User=mmdvm Type=forking -ExecStart=/usr/bin/local/MMDVMHost +ExecStart=/usr/local/bin/MMDVMHost Restart=on-abnormal [Install] From 7aec7eefcb08f98fbe6d7a71e621bcb06aa37641 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 08:36:22 +0200 Subject: [PATCH 13/14] Add install service to othe rmakefiles --- Makefile.Pi | 25 ++++++++++++++++++++++++- Makefile.Pi.Adafruit | 25 ++++++++++++++++++++++++- Makefile.Pi.HD44780 | 25 ++++++++++++++++++++++++- Makefile.Pi.OLED | 25 ++++++++++++++++++++++++- Makefile.Pi.PCF8574 | 25 ++++++++++++++++++++++++- 5 files changed, 120 insertions(+), 5 deletions(-) diff --git a/Makefile.Pi b/Makefile.Pi index 7123530..3b14a13 100644 --- a/Makefile.Pi +++ b/Makefile.Pi @@ -34,10 +34,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit index 4c5e9f5..149d9ba 100644 --- a/Makefile.Pi.Adafruit +++ b/Makefile.Pi.Adafruit @@ -35,10 +35,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780 index 186b22f..85044ef 100644 --- a/Makefile.Pi.HD44780 +++ b/Makefile.Pi.HD44780 @@ -35,10 +35,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED index 34b2a9e..0a3d7bb 100644 --- a/Makefile.Pi.OLED +++ b/Makefile.Pi.OLED @@ -35,10 +35,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574 index bda859b..deda9e3 100644 --- a/Makefile.Pi.PCF8574 +++ b/Makefile.Pi.PCF8574 @@ -36,10 +36,33 @@ RemoteCommand: Log.o RemoteCommand.o UDPSocket.o %.o: %.cpp $(CXX) $(CFLAGS) -c -o $@ $< -install: +.PHONY install: +install: all install -m 755 MMDVMHost /usr/local/bin/ install -m 755 RemoteCommand /usr/local/bin/ +.PHONY install-service: +install-service: install /etc/MMDVM.ini + @useradd --user-group -M --system mmdvm --shell /bin/false || true + @usermod --groups dialout --append mmdvm || true + @mkdir /var/log/mmdvm || true + @chown mmdvm:mmdvm /var/log/mmdvm + @cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/ + @systemctl enable mmdvmhost.service + +/etc/MMDVM.ini: + @cp -n MMDVM.ini /etc/MMDVM.ini + @sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini + @sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini + @chown mmdvm:mmdvm /etc/MMDVM.ini + +.PHONY uninstall-service: +uninstall-service: + @systemctl stop mmdvmhost.service || true + @systemctl disable mmdvmhost.service || true + @rm -f /usr/local/bin/MMDVMHost || true + @rm -f /lib/systemd/system/mmdvmhost.service || true + clean: $(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h From c2c1266233cf4b8b5655b386c78ffe23a4037d01 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 20 Jul 2020 09:08:58 +0200 Subject: [PATCH 14/14] Correct typo --- linux/systemd/mmdvmhost.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service index 7ab6aa1..27ca4ee 100644 --- a/linux/systemd/mmdvmhost.service +++ b/linux/systemd/mmdvmhost.service @@ -1,5 +1,5 @@ [Unit] -Description=MMDVMHost Radio Servce +Description=MMDVMHost Radio Service After=syslog.target network.target [Service]