diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index be9e7d21..b8a5fe97 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -3,7 +3,7 @@ # OpenIPC.org | 2024 # -scr_version=1.0.34 +scr_version=1.0.35 args=" $@" @@ -102,7 +102,7 @@ download_firmware() { free_resources() { echo_c 37 "\nStop services, sync files, free up memory" - for proc in crond klogd majestic ntpd rngd syslogd; do + for proc in majestic crond klogd ntpd rngd syslogd; do echo -n "Killing $proc " while [ -n "$(pidof $proc)" ]; do killall -q $proc diff --git a/general/package/majestic/Config.in b/general/package/majestic/Config.in index b13c8691..2b69c41f 100644 --- a/general/package/majestic/Config.in +++ b/general/package/majestic/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_MAJESTIC bool "Majestic streamer" default n - select BR2_PACKAGE_MAJESTIC_PLUGINS help Tiny but powerful IPC streaming software (non-commercial version for personal use only) diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index 1b05b98d..c21986d2 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -12,10 +12,8 @@ MAJESTIC_LICENSE_FILES = LICENSE MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY) MAJESTIC_RELEASE = $(OPENIPC_FLAVOR) -# filter Majestic ultimate for these platforms -MAJESTIC_LIST = t20 t21 hi3516av100 hi3519v101 - -ifneq ($(filter $(MAJESTIC_LIST),$(MAJESTIC_FAMILY)),) +MAJESTIC_ULTIMATE = t20 t21 hi3516av100 hi3519v101 +ifneq ($(filter $(MAJESTIC_ULTIMATE),$(MAJESTIC_FAMILY)),) MAJESTIC_RELEASE = lite endif @@ -23,19 +21,22 @@ ifeq ($(MAJESTIC_RELEASE),lte) MAJESTIC_RELEASE = fpv endif -MAJESTIC_DEPENDENCIES = \ +MAJESTIC_VENDOR = hisilicon goke ingenic sigmastar +ifneq ($(filter $(MAJESTIC_VENDOR),$(OPENIPC_SOC_VENDOR)),) + MAJESTIC_DEPENDENCIES += majestic-plugins +endif + +MAJESTIC_DEPENDENCIES += \ libevent-openipc \ libogg-openipc \ mbedtls-openipc \ opus-openipc \ json-c -MAJESTIC_STRIP_COMPONENTS = 0 - define MAJESTIC_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml - $(INSTALL) -m 644 $(@D)/majestic.yaml $(TARGET_DIR)/etc/majestic.full + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.full $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(MAJESTIC_PKGDIR)/files/S95majestic