From cf6eb249e344ea1dba36d189b2cdad0f46ed97ba Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 27 Mar 2025 14:58:10 +0800 Subject: [PATCH] luci-app-qmodem: combine luci-app-qmodem_with_lua_index_page in prebuild ipk --- luci/luci-app-qmodem/Makefile | 16 ++-------------- .../root/etc/uci-defaults/luci-app-qmodem | 4 ++++ .../view/admin_status/index}/modem_overview.htm | 0 3 files changed, 6 insertions(+), 14 deletions(-) rename luci/luci-app-qmodem/{files => root/usr/lib/lua/luci/view/admin_status/index}/modem_overview.htm (100%) diff --git a/luci/luci-app-qmodem/Makefile b/luci/luci-app-qmodem/Makefile index b4a718c..e789d8c 100644 --- a/luci/luci-app-qmodem/Makefile +++ b/luci/luci-app-qmodem/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-qmodem LUCI_TITLE:=LuCI support for QWRT Modem LUCI_PKGARCH:=all -PKG_VERSION:=2.6.1 +PKG_VERSION:=2.6.2 PKG_LICENSE:=GPLv3 PKG_LINCESE_FILES:=LICENSE PKG_MAINTAINER:=Tom @@ -30,7 +30,6 @@ LUCI_DEPENDS:=+luci-compat \ +PACKAGE_luci-app-qmodem_USE_TOM_CUSTOMIZED_QUECTEL_CM:quectel-CM-5G-M \ +PACKAGE_luci-app-qmodem_USING_QWRT_QUECTEL_CM_5G:quectel-CM-5G \ +PACKAGE_luci-app-qmodem_USING_NORMAL_QUECTEL_CM:quectel-cm \ - +luci-app-qmodem_with_lua_index_page \ +tom_modem \ +jq +bc\ +coreutils +coreutils-stat @@ -75,17 +74,6 @@ endchoice default n endef -define Package/luci-app-qmodem_with_lua_index_page - TITLE:= QWRT Modem with Lua Luci Index Page -endef - -define Package/luci-app-qmodem_with_lua_index_page/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/admin_status/index - if [ ! -f $(TOPDIR)/feeds/luci/package.json ]; then \ - $(INSTALL_DATA) ./files/modem_overview.htm $(1)/usr/lib/lua/luci/view/admin_status/index/; \ - fi -endef - include $(TOPDIR)/feeds/luci/luci.mk -$(eval $(call BuildPackage,luci-app-qmodem_with_lua_index_page)) + # call BuildPackage - OpenWrt buildroot signature diff --git a/luci/luci-app-qmodem/root/etc/uci-defaults/luci-app-qmodem b/luci/luci-app-qmodem/root/etc/uci-defaults/luci-app-qmodem index 9fb55b4..ee1d75b 100644 --- a/luci/luci-app-qmodem/root/etc/uci-defaults/luci-app-qmodem +++ b/luci/luci-app-qmodem/root/etc/uci-defaults/luci-app-qmodem @@ -14,5 +14,9 @@ uci -q batch <<-EOF >/dev/null commit ucitrack EOF +if [ -f /www/luci-static/resources/luci.js ]; then + rm -f /usr/lib/lua/luci/view/admin_status/index/modem_overview.htm +fi + rm -rf /tmp/luci-*cache exit 0 diff --git a/luci/luci-app-qmodem/files/modem_overview.htm b/luci/luci-app-qmodem/root/usr/lib/lua/luci/view/admin_status/index/modem_overview.htm similarity index 100% rename from luci/luci-app-qmodem/files/modem_overview.htm rename to luci/luci-app-qmodem/root/usr/lib/lua/luci/view/admin_status/index/modem_overview.htm