From b0056a52ae7a75730f3db703ed42b99a70d48185 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 13 Apr 2020 02:38:18 +0800 Subject: [PATCH] luci-app-k3usb: sort out files --- package/zxlhhyccc/luci-app-k3usb/Makefile | 47 ++++--------------- .../luci => luasrc}/controller/k3usb.lua | 0 .../luci => luasrc}/model/cbi/k3usb.lua | 0 .../i18n/k3usb.zh-cn.po => po/zh-cn/k3usb.po} | 0 .../{files => }/root/etc/config/k3usb | 0 .../{files => }/root/etc/init.d/k3usb | 0 .../{files => }/root/etc/uci-defaults/k3usb | 0 .../{files => }/root/usr/k3usb/35-usb-ehci | 0 .../{files => }/root/usr/k3usb/40-usb2 | 0 .../root/usr/k3usb/45-phy-bcm-ns-usb2 | 0 .../root/usr/k3usb/45-phy-bcm-ns-usb3 | 0 .../{files => }/root/usr/k3usb/50-usb-ohci | 0 .../{files => }/root/usr/k3usb/54-usb3 | 0 .../{files => }/root/usr/k3usb/test | 0 .../{files => }/root/usr/k3usb/usb-storage | 0 .../root/usr/k3usb/usb-storage-extras | 0 16 files changed, 8 insertions(+), 39 deletions(-) rename package/zxlhhyccc/luci-app-k3usb/{files/luci => luasrc}/controller/k3usb.lua (100%) rename package/zxlhhyccc/luci-app-k3usb/{files/luci => luasrc}/model/cbi/k3usb.lua (100%) rename package/zxlhhyccc/luci-app-k3usb/{files/luci/i18n/k3usb.zh-cn.po => po/zh-cn/k3usb.po} (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/etc/config/k3usb (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/etc/init.d/k3usb (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/etc/uci-defaults/k3usb (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/35-usb-ehci (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/40-usb2 (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/45-phy-bcm-ns-usb2 (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/45-phy-bcm-ns-usb3 (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/50-usb-ohci (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/54-usb3 (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/test (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/usb-storage (100%) rename package/zxlhhyccc/luci-app-k3usb/{files => }/root/usr/k3usb/usb-storage-extras (100%) diff --git a/package/zxlhhyccc/luci-app-k3usb/Makefile b/package/zxlhhyccc/luci-app-k3usb/Makefile index 5c2e99d1b6..e94a35aab1 100644 --- a/package/zxlhhyccc/luci-app-k3usb/Makefile +++ b/package/zxlhhyccc/luci-app-k3usb/Makefile @@ -2,50 +2,19 @@ include $(TOPDIR)/rules.mk +LUCI_TITLE:=LuCI Support for k3usb3.0 on or off +LUCI_DESCRIPTION:=LuCI Support for k3usb3.0 on or off. +LUCI_DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 +LUCI_PKGARCH:=all + PKG_NAME:=luci-app-k3usb PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Shenzt -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +include $(TOPDIR)/feeds/luci/luci.mk -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI Support for k3usb3.0 on or off - DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 -endef - -define Package/$(PKG_NAME)/description - LuCI Support for k3usb3.0 on or off. -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/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller - $(INSTALL_DATA) ./files/luci/controller/k3usb.lua $(1)/usr/lib/lua/luci/controller/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(INSTALL_DATA) $(PKG_BUILD_DIR)/k3usb*.lmo $(1)/usr/lib/lua/luci/i18n/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi - $(INSTALL_DATA) ./files/luci/model/cbi/k3usb.lua $(1)/usr/lib/lua/luci/model/cbi/ - $(INSTALL_DIR) $(1)/ - cp -pR ./files/root/* $(1)/ -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/zxlhhyccc/luci-app-k3usb/files/luci/controller/k3usb.lua b/package/zxlhhyccc/luci-app-k3usb/luasrc/controller/k3usb.lua similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/luci/controller/k3usb.lua rename to package/zxlhhyccc/luci-app-k3usb/luasrc/controller/k3usb.lua diff --git a/package/zxlhhyccc/luci-app-k3usb/files/luci/model/cbi/k3usb.lua b/package/zxlhhyccc/luci-app-k3usb/luasrc/model/cbi/k3usb.lua similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/luci/model/cbi/k3usb.lua rename to package/zxlhhyccc/luci-app-k3usb/luasrc/model/cbi/k3usb.lua diff --git a/package/zxlhhyccc/luci-app-k3usb/files/luci/i18n/k3usb.zh-cn.po b/package/zxlhhyccc/luci-app-k3usb/po/zh-cn/k3usb.po similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/luci/i18n/k3usb.zh-cn.po rename to package/zxlhhyccc/luci-app-k3usb/po/zh-cn/k3usb.po diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/etc/config/k3usb b/package/zxlhhyccc/luci-app-k3usb/root/etc/config/k3usb similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/etc/config/k3usb rename to package/zxlhhyccc/luci-app-k3usb/root/etc/config/k3usb diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/etc/init.d/k3usb b/package/zxlhhyccc/luci-app-k3usb/root/etc/init.d/k3usb similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/etc/init.d/k3usb rename to package/zxlhhyccc/luci-app-k3usb/root/etc/init.d/k3usb diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/etc/uci-defaults/k3usb b/package/zxlhhyccc/luci-app-k3usb/root/etc/uci-defaults/k3usb similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/etc/uci-defaults/k3usb rename to package/zxlhhyccc/luci-app-k3usb/root/etc/uci-defaults/k3usb diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/35-usb-ehci b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/35-usb-ehci similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/35-usb-ehci rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/35-usb-ehci diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/40-usb2 b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/40-usb2 similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/40-usb2 rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/40-usb2 diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/45-phy-bcm-ns-usb2 b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/45-phy-bcm-ns-usb2 similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/45-phy-bcm-ns-usb2 rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/45-phy-bcm-ns-usb2 diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/45-phy-bcm-ns-usb3 b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/45-phy-bcm-ns-usb3 similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/45-phy-bcm-ns-usb3 rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/45-phy-bcm-ns-usb3 diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/50-usb-ohci b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/50-usb-ohci similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/50-usb-ohci rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/50-usb-ohci diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/54-usb3 b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/54-usb3 similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/54-usb3 rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/54-usb3 diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/test b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/test similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/test rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/test diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/usb-storage b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/usb-storage similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/usb-storage rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/usb-storage diff --git a/package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/usb-storage-extras b/package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/usb-storage-extras similarity index 100% rename from package/zxlhhyccc/luci-app-k3usb/files/root/usr/k3usb/usb-storage-extras rename to package/zxlhhyccc/luci-app-k3usb/root/usr/k3usb/usb-storage-extras