From 29a1468b77113de4426b8b7fb828321d90165ef7 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 13 Apr 2020 02:17:45 +0800 Subject: [PATCH] luci-app-mentohust: sort out files --- package/ctcgfw/luci-app-mentohust/Makefile | 56 +++---------------- .../luci/controller/mentohust.lua | 0 .../luci/model/cbi/mentohust/general.lua | 0 .../luci/model/cbi/mentohust/log.lua | 0 .../zh_Hans/mentohust.po} | 0 .../{files => }/root/etc/config/mentohust | 0 .../{files => }/root/etc/init.d/mentohust | 0 7 files changed, 9 insertions(+), 47 deletions(-) rename package/ctcgfw/luci-app-mentohust/{files => luasrc}/luci/controller/mentohust.lua (100%) rename package/ctcgfw/luci-app-mentohust/{files => luasrc}/luci/model/cbi/mentohust/general.lua (100%) rename package/ctcgfw/luci-app-mentohust/{files => luasrc}/luci/model/cbi/mentohust/log.lua (100%) rename package/ctcgfw/luci-app-mentohust/{files/luci/i18n/mentohust.zh-cn.po => po/zh_Hans/mentohust.po} (100%) rename package/ctcgfw/luci-app-mentohust/{files => }/root/etc/config/mentohust (100%) rename package/ctcgfw/luci-app-mentohust/{files => }/root/etc/init.d/mentohust (100%) diff --git a/package/ctcgfw/luci-app-mentohust/Makefile b/package/ctcgfw/luci-app-mentohust/Makefile index c7d5eb7a06..f35d0eab51 100644 --- a/package/ctcgfw/luci-app-mentohust/Makefile +++ b/package/ctcgfw/luci-app-mentohust/Makefile @@ -1,53 +1,15 @@ include $(TOPDIR)/rules.mk +LUCI_TITLE:=MentoHUST 802.1X Client for LuCI +LUCI_DESCRIPTION:=This package contains LuCI configuration pages for 8021xclient. +LUCI_DEPENDS:=+mentohust +LUCI_PKGARCH:=all + PKG_NAME:=luci-app-mentohust -PKG_VERSION=1.1.1 -PKG_RELEASE:=0 +PKG_VERSION:=1.1.1 +PKG_RELEASE:=2 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +include $(TOPDIR)/feeds/luci/luci.mk -include $(INCLUDE_DIR)/package.mk +# call BuildPackage - OpenWrt buildroot signature -define Package/luci-app-mentohust - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=MentoHUST 802.1X Client for LuCI - PKGARCH:=all - DEPENDS:=+mentohust -endef - -define Package/luci-app-mentohust/description - This package contains LuCI configuration pages for 8021xclient. -endef - -define Package/luci-app-mentohust/conffiles -/etc/config/mentohust -endef - -define Build/Prepare - $(foreach po,$(wildcard ${CURDIR}/files/luci/i18n/*.po), \ - po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/luci-app-mentohust/install - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/mentohust - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(INSTALL_DATA) $(PKG_BUILD_DIR)/mentohust.*.lmo $(1)/usr/lib/lua/luci/i18n/ - $(INSTALL_CONF) ./files/root/etc/config/mentohust $(1)/etc/config/mentohust - $(INSTALL_BIN) ./files/root/etc/init.d/mentohust $(1)/etc/init.d/mentohust - $(INSTALL_DATA) ./files/luci/model/cbi/mentohust/general.lua $(1)/usr/lib/lua/luci/model/cbi/mentohust/general.lua - $(INSTALL_DATA) ./files/luci/model/cbi/mentohust/log.lua $(1)/usr/lib/lua/luci/model/cbi/mentohust/log.lua - $(INSTALL_DATA) ./files/luci/controller/mentohust.lua $(1)/usr/lib/lua/luci/controller/mentohust.lua -endef - -$(eval $(call BuildPackage,luci-app-mentohust)) diff --git a/package/ctcgfw/luci-app-mentohust/files/luci/controller/mentohust.lua b/package/ctcgfw/luci-app-mentohust/luasrc/luci/controller/mentohust.lua similarity index 100% rename from package/ctcgfw/luci-app-mentohust/files/luci/controller/mentohust.lua rename to package/ctcgfw/luci-app-mentohust/luasrc/luci/controller/mentohust.lua diff --git a/package/ctcgfw/luci-app-mentohust/files/luci/model/cbi/mentohust/general.lua b/package/ctcgfw/luci-app-mentohust/luasrc/luci/model/cbi/mentohust/general.lua similarity index 100% rename from package/ctcgfw/luci-app-mentohust/files/luci/model/cbi/mentohust/general.lua rename to package/ctcgfw/luci-app-mentohust/luasrc/luci/model/cbi/mentohust/general.lua diff --git a/package/ctcgfw/luci-app-mentohust/files/luci/model/cbi/mentohust/log.lua b/package/ctcgfw/luci-app-mentohust/luasrc/luci/model/cbi/mentohust/log.lua similarity index 100% rename from package/ctcgfw/luci-app-mentohust/files/luci/model/cbi/mentohust/log.lua rename to package/ctcgfw/luci-app-mentohust/luasrc/luci/model/cbi/mentohust/log.lua diff --git a/package/ctcgfw/luci-app-mentohust/files/luci/i18n/mentohust.zh-cn.po b/package/ctcgfw/luci-app-mentohust/po/zh_Hans/mentohust.po similarity index 100% rename from package/ctcgfw/luci-app-mentohust/files/luci/i18n/mentohust.zh-cn.po rename to package/ctcgfw/luci-app-mentohust/po/zh_Hans/mentohust.po diff --git a/package/ctcgfw/luci-app-mentohust/files/root/etc/config/mentohust b/package/ctcgfw/luci-app-mentohust/root/etc/config/mentohust similarity index 100% rename from package/ctcgfw/luci-app-mentohust/files/root/etc/config/mentohust rename to package/ctcgfw/luci-app-mentohust/root/etc/config/mentohust diff --git a/package/ctcgfw/luci-app-mentohust/files/root/etc/init.d/mentohust b/package/ctcgfw/luci-app-mentohust/root/etc/init.d/mentohust similarity index 100% rename from package/ctcgfw/luci-app-mentohust/files/root/etc/init.d/mentohust rename to package/ctcgfw/luci-app-mentohust/root/etc/init.d/mentohust