Merge branch 'master' into master

OpenIPC · Dec 28, 2024 · 5c6b9e9 · 5c6b9e9
2 parents 1adc6bd + 9914acd
commit 5c6b9e9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/general/package/majestic-plugins/majestic-plugins.mk b/general/package/majestic-plugins/majestic-plugins.mk
@@ -4,9 +4,12 @@
 #
 ################################################################################
 
-MAJESTIC_PLUGINS_SITE = $(call github,openipc,majestic-plugins,$(MAJESTIC_PLUGINS_VERSION))
+MAJESTIC_PLUGINS_SITE_METHOD = git
+MAJESTIC_PLUGINS_SITE = https://github.com/openipc/majestic-plugins
 MAJESTIC_PLUGINS_VERSION = HEAD
 
+MAJESTIC_PLUGINS_GIT_SUBMODULES = YES
+
 define MAJESTIC_PLUGINS_BUILD_CMDS
 	$(MAKE) CC=$(TARGET_CC) TARGET=$(OPENIPC_SOC_VENDOR) -C $(@D) -B
 endef

diff --git a/general/package/majestic/Config.in b/general/package/majestic/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_MAJESTIC
 	bool "Majestic streamer"
-	default n
 	help
 	  Tiny but powerful IPC streaming software
 	  (non-commercial version for personal use only)

diff --git a/general/package/majestic/files/S95majestic b/general/package/majestic/files/S95majestic
@@ -5,9 +5,6 @@ PIDFILE="/var/run/$DAEMON.pid"
 DAEMON_ARGS="-s"
 
 start() {
-	ulimit -c unlimited
-	echo "/tmp/core.majestic" > /proc/sys/kernel/core_pattern
-
 	echo -n "Starting $DAEMON: "
 	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS
 	if [ $? -eq 0 ]; then

diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
@@ -19,11 +19,6 @@ MAJESTIC_DEPENDENCIES += \
 	opus-openipc \
 	json-c
 
-MAJESTIC_FILTER = hi3516ev200 gk7205v200 infinity6b0 infinity6e t31
-ifneq ($(filter $(MAJESTIC_FILTER),$(MAJESTIC_FAMILY)),)
-	MAJESTIC_DEPENDENCIES += majestic-plugins
-endif
-
 define MAJESTIC_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml