From b6e4d154d7ca4c2f66dd691845274ddbc97d8d81 Mon Sep 17 00:00:00 2001 From: gtxaspec Date: Sun, 3 Mar 2024 20:12:57 -0800 Subject: [PATCH] rename prudynt; update configs --- configs/cinnado_d1_t31l_sc2336_pru_defconfig | 2 +- package/Config.in | 2 +- package/prudynt_t/Config.in | 5 ++ package/prudynt_t/files/S95prudynt | 61 +++++++++++++++++++ .../prudynt_v3.mk => prudynt_t/prudynt_t.mk} | 13 ++-- package/prudynt_v3/Config.in | 5 -- 6 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 package/prudynt_t/Config.in create mode 100755 package/prudynt_t/files/S95prudynt rename package/{prudynt_v3/prudynt_v3.mk => prudynt_t/prudynt_t.mk} (67%) delete mode 100644 package/prudynt_v3/Config.in diff --git a/configs/cinnado_d1_t31l_sc2336_pru_defconfig b/configs/cinnado_d1_t31l_sc2336_pru_defconfig index 4546adbc8..f206f9ae9 100644 --- a/configs/cinnado_d1_t31l_sc2336_pru_defconfig +++ b/configs/cinnado_d1_t31l_sc2336_pru_defconfig @@ -42,4 +42,4 @@ BR2_PACKAGE_ATBM60XX=y BR2_PACKAGE_ATBM60XX_MODEL_6031=y BR2_PACKAGE_MOSQUITTO=y BR2_PACKAGE_MOTORS=y -BR2_PACKAGE_PRUDYNT_V3=y +BR2_PACKAGE_PRUDYNT_T=y diff --git a/package/Config.in b/package/Config.in index 17f7798b4..ceba56c7e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -44,6 +44,6 @@ source "$BR2_EXTERNAL_THINGINO_PATH/package/vtund-openipc/Config.in" source "$BR2_EXTERNAL_THINGINO_PATH/package/webui/Config.in" source "$BR2_EXTERNAL_THINGINO_PATH/package/yaml-cli/Config.in" source "$BR2_EXTERNAL_THINGINO_PATH/package/zerotier-one/Config.in" -source "$BR2_EXTERNAL_THINGINO_PATH/package/prudynt_v3/Config.in" +source "$BR2_EXTERNAL_THINGINO_PATH/package/prudynt_t/Config.in" source "$BR2_EXTERNAL_THINGINO_PATH/package/thingino-live555/Config.in" source "$BR2_EXTERNAL_THINGINO_PATH/package/thingino-fonts/Config.in" diff --git a/package/prudynt_t/Config.in b/package/prudynt_t/Config.in new file mode 100644 index 000000000..5a1bc0c06 --- /dev/null +++ b/package/prudynt_t/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_PRUDYNT_T + bool "prudynt-t for T31" + select BR2_PACKAGE_INGENIC_LIBIMP_CONTROL + help + Experimental streamer diff --git a/package/prudynt_t/files/S95prudynt b/package/prudynt_t/files/S95prudynt new file mode 100755 index 000000000..74a0ceb10 --- /dev/null +++ b/package/prudynt_t/files/S95prudynt @@ -0,0 +1,61 @@ +#!/bin/sh + +DAEMON=prudynt +DAEMON_PATH="/usr/bin" +PIDFILE="/var/run/$DAEMON.pid" + +load_daemon() { + printf 'Starting %s: ' "$DAEMON" + [ -f $DAEMON_PATH/$DAEMON ] || echo -en "DISABLED, " + + start-stop-daemon -b -m -S -p $PIDFILE -x \ + /usr/bin/env -- LD_PRELOAD=/usr/lib/libimp_control.so $DAEMON_PATH/$DAEMON + + status=$? + + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return $status +} + +start() { + load_daemon +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + [ -f "$DAEMON_PATH/$DAEMON" ] || echo -en "DISABLED, " + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return $status +} + +restart() { + stop || true + sleep 1 + reload +} + +reload() { + load_daemon +} + +case "$1" in + start | stop | restart | reload) + $1 + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit 0 diff --git a/package/prudynt_v3/prudynt_v3.mk b/package/prudynt_t/prudynt_t.mk similarity index 67% rename from package/prudynt_v3/prudynt_v3.mk rename to package/prudynt_t/prudynt_t.mk index 2d1a8cb55..86debafdc 100644 --- a/package/prudynt_v3/prudynt_v3.mk +++ b/package/prudynt_t/prudynt_t.mk @@ -1,7 +1,7 @@ -PRUDYNT_V3_SITE_METHOD = git -PRUDYNT_V3_SITE = https://github.com/gtxaspec/prudynt-v3 -PRUDYNT_V3_VERSION = $(shell git ls-remote $(PRUDYNT_V3_SITE) HEAD | head -1 | cut -f1) -PRUDYNT_V3_DEPENDENCIES = libconfig thingino-live555 ingenic-osdrv-t31 freetype thingino-fonts +PRUDYNT_T_SITE_METHOD = git +PRUDYNT_T_SITE = https://github.com/gtxaspec/prudynt-t +PRUDYNT_T_VERSION = $(shell git ls-remote $(PRUDYNT_T_SITE) HEAD | head -1 | cut -f1) +PRUDYNT_T_DEPENDENCIES = libconfig thingino-live555 ingenic-osdrv-t31 freetype thingino-fonts # PRUDYNT_CFLAGS = $(TARGET_CLAGS) PRUDYNT_CFLAGS += -DNO_OPENSSL=1 -Og -g @@ -16,14 +16,15 @@ PRUDYNT_LDFLAGS = $(TARGET_LDFLAGS) PRUDYNT_LDFLAGS += -L$(STAGING_DIR)/usr/lib PRUDYNT_LDFLAGS += -L$(TARGET_DIR)/usr/lib -define PRUDYNT_V3_BUILD_CMDS +define PRUDYNT_T_BUILD_CMDS $(MAKE) ARCH=$(TARGET_ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS="$(PRUDYNT_CFLAGS)" LDFLAGS="$(PRUDYNT_LDFLAGS)" -C $(@D) all endef -define PRUDYNT_V3_INSTALL_TARGET_CMDS +define PRUDYNT_T_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/bin/prudynt $(TARGET_DIR)/usr/bin/prudynt $(INSTALL) -m 0644 -D $(@D)/prudynt.cfg.example $(TARGET_DIR)/etc/prudynt.cfg + $(INSTALL) -m 0755 -D $(PRUDYNT_T_PKGDIR)/files/S95prudynt $(TARGET_DIR)/etc/init.d/S95prudynt endef $(eval $(generic-package)) diff --git a/package/prudynt_v3/Config.in b/package/prudynt_v3/Config.in deleted file mode 100644 index 031a7c65e..000000000 --- a/package/prudynt_v3/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_PRUDYNT_V3 - bool "prudynt for t31" - default n - help - Experimental port