From 655c9e0a00700b8b53958fbce8ccb3a0973d0813 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 13 Apr 2020 02:22:31 +0800 Subject: [PATCH] luci-app-k3screenctrl: sort out files --- package/ctcgfw/luci-app-k3screenctrl/Makefile | 45 ++++--------------- .../controller/k3screenctrl.lua | 0 .../model/cbi/k3screenctrl.lua | 0 .../zh_Hans/k3screenctrl.po} | 0 4 files changed, 8 insertions(+), 37 deletions(-) rename package/ctcgfw/luci-app-k3screenctrl/{files/luci => luasrc}/controller/k3screenctrl.lua (100%) rename package/ctcgfw/luci-app-k3screenctrl/{files/luci => luasrc}/model/cbi/k3screenctrl.lua (100%) rename package/ctcgfw/luci-app-k3screenctrl/{files/luci/i18n/k3screenctrl.zh-cn.po => po/zh_Hans/k3screenctrl.po} (100%) diff --git a/package/ctcgfw/luci-app-k3screenctrl/Makefile b/package/ctcgfw/luci-app-k3screenctrl/Makefile index 7666b5b568..7f52b42032 100644 --- a/package/ctcgfw/luci-app-k3screenctrl/Makefile +++ b/package/ctcgfw/luci-app-k3screenctrl/Makefile @@ -2,48 +2,19 @@ include $(TOPDIR)/rules.mk +LUCI_TITLE:=LuCI Support for k3screenctrl +LUCI_DESCRIPTION:=LuCI Support for k3screenctrl. +LUCI_DEPENDS:=+phicomm-k3screenctrl +@BUSYBOX_CONFIG_ARPING +LUCI_PKGARCH:=all + PKG_NAME:=luci-app-k3screenctrl PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Hill -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +include $(TOPDIR)/feeds/luci/luci.mk -include $(INCLUDE_DIR)/package.mk - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/$(PKG_NAME) - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI Support for k3screenctrl - DEPENDS:=@PACKAGE_phicomm-k3screenctrl +phicomm-k3screenctrl +@BUSYBOX_CONFIG_ARPING -endef - -define Package/$(PKG_NAME)/description - LuCI Support for k3screenctrl. -endef - -define Build/Prepare - $(foreach po,$(wildcard ${CURDIR}/files/luci/i18n/*.po), \ - po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller - $(INSTALL_DATA) ./files/luci/controller/k3screenctrl.lua $(1)/usr/lib/lua/luci/controller/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(INSTALL_DATA) $(PKG_BUILD_DIR)/k3screenctrl.*.lmo $(1)/usr/lib/lua/luci/i18n/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi - $(INSTALL_DATA) ./files/luci/model/cbi/k3screenctrl.lua $(1)/usr/lib/lua/luci/model/cbi/ -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/controller/k3screenctrl.lua b/package/ctcgfw/luci-app-k3screenctrl/luasrc/controller/k3screenctrl.lua similarity index 100% rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/controller/k3screenctrl.lua rename to package/ctcgfw/luci-app-k3screenctrl/luasrc/controller/k3screenctrl.lua diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/model/cbi/k3screenctrl.lua b/package/ctcgfw/luci-app-k3screenctrl/luasrc/model/cbi/k3screenctrl.lua similarity index 100% rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/model/cbi/k3screenctrl.lua rename to package/ctcgfw/luci-app-k3screenctrl/luasrc/model/cbi/k3screenctrl.lua diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.po b/package/ctcgfw/luci-app-k3screenctrl/po/zh_Hans/k3screenctrl.po similarity index 100% rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.po rename to package/ctcgfw/luci-app-k3screenctrl/po/zh_Hans/k3screenctrl.po