From b88ff6b39d5c7bf0ac7105ab563df042e4618912 Mon Sep 17 00:00:00 2001 From: cronyx Date: Wed, 23 Apr 2025 00:10:35 +0300 Subject: [PATCH] modified webui if fpv version is installed (#1802) --- .../package/majestic-webui/majestic-webui.mk | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/general/package/majestic-webui/majestic-webui.mk b/general/package/majestic-webui/majestic-webui.mk index 4794feed..9f29844f 100644 --- a/general/package/majestic-webui/majestic-webui.mk +++ b/general/package/majestic-webui/majestic-webui.mk @@ -9,7 +9,13 @@ MAJESTIC_WEBUI_VERSION = HEAD MAJESTIC_WEBUI_LICENSE = MIT MAJESTIC_WEBUI_LICENSE_FILES = LICENSE -define MAJESTIC_WEBUI_INSTALL_TARGET_CMDS +ifneq ($(findstring fpv,$(OPENIPC_VARIANT)),) + VERSION = FPV +else + VERSION = STANDARD +endif + +define MAJESTIC_WEBUI_INSTALL $(INSTALL) -m 755 -d $(TARGET_DIR)/usr cp -r $(@D)/sbin $(TARGET_DIR)/usr @@ -17,4 +23,22 @@ define MAJESTIC_WEBUI_INSTALL_TARGET_CMDS cp -r $(@D)/www $(TARGET_DIR)/var endef +define MAJESTIC_WEBUI_STANDARD_FIXUP + rm $(TARGET_DIR)/var/www/cgi-bin/fpv-wfb.cgi + rm $(TARGET_DIR)/var/www/cgi-bin/j/locale_fpv.cgi + rm $(TARGET_DIR)/var/www/cgi-bin/p/header_fpv.cgi +endef + +define MAJESTIC_WEBUI_FPV_FIXUP + mv -f $(TARGET_DIR)/var/www/cgi-bin/j/locale_fpv.cgi $(TARGET_DIR)/var/www/cgi-bin/j/locale.cgi + mv -f $(TARGET_DIR)/var/www/cgi-bin/p/header_fpv.cgi $(TARGET_DIR)/var/www/cgi-bin/p/header.cgi + rm $(TARGET_DIR)/usr/sbin/telegram + rm $(TARGET_DIR)/usr/sbin/openwall +endef + +define MAJESTIC_WEBUI_INSTALL_TARGET_CMDS + $(MAJESTIC_WEBUI_INSTALL) + $(MAJESTIC_WEBUI_$(VERSION)_FIXUP) +endef + $(eval $(generic-package))