diff --git a/package/ctcgfw/luci-app-airwhu/Makefile b/package/ctcgfw/luci-app-airwhu/Makefile index 731f3a9569..1e07ecea21 100644 --- a/package/ctcgfw/luci-app-airwhu/Makefile +++ b/package/ctcgfw/luci-app-airwhu/Makefile @@ -3,45 +3,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-airwhu PKG_VERSION=1.0 PKG_RELEASE:=1 +LUCI_TITLE:=luci-app-airwhu +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+mentohust +kmod-ipt-nat6 +LUCI_DESCRIPTION:=LuCI web-interface for Ruijie 802.1X Client with IPv6 NAT. -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +include $(TOPDIR)/feeds/luci/luci.mk -include $(INCLUDE_DIR)/package.mk - -define Package/luci-app-airwhu - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - DEPENDS:=+mentohust +kmod-ipt-nat6 - TITLE:=luci-app-airwhu - PKGARCH:=all -endef - -define Package/luci-app-airwhu/description - LuCI web-interface for Ruijie 802.1X Client with IPv6 NAT. -endef - -define Build/Prepare -endef - -define Build/Compile -endef - -define Package/luci-app-airwhu/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller - $(INSTALL_DATA) ./luasrc/controller/*.lua $(1)/usr/lib/lua/luci/controller/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi - $(INSTALL_DATA) ./luasrc/model/cbi/*.lua $(1)/usr/lib/lua/luci/model/cbi/ - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./root/etc/config/airwhu $(1)/etc/config/airwhu - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./root/etc/init.d/mentohust $(1)/etc/init.d/mentohust - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_BIN) ./root/etc/hotplug.d/iface/99-ipv6nat $(1)/etc/hotplug.d/iface/99-ipv6nat - $(INSTALL_DIR) $(1)/bin - $(INSTALL_BIN) ./root/bin/ipv6masq.sh $(1)/bin/ipv6masq.sh - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - po2lmo ./po/zh_cn/airwhu.po $(1)/usr/lib/lua/luci/i18n/airwhu.zh-cn.lmo -endef - -$(eval $(call BuildPackage,luci-app-airwhu)) +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/ctcgfw/luci-app-airwhu/po/zh_cn/airwhu.po b/package/ctcgfw/luci-app-airwhu/po/zh-cn/airwhu.po similarity index 100% rename from package/ctcgfw/luci-app-airwhu/po/zh_cn/airwhu.po rename to package/ctcgfw/luci-app-airwhu/po/zh-cn/airwhu.po diff --git a/package/firmware/linux-firmware/qca_ath10k.mk b/package/firmware/linux-firmware/qca_ath10k.mk index 72735819fd..6019ce26ec 100644 --- a/package/firmware/linux-firmware/qca_ath10k.mk +++ b/package/firmware/linux-firmware/qca_ath10k.mk @@ -19,7 +19,7 @@ define Package/ath10k-firmware-qca4019/install $(PKG_BUILD_DIR)/ath10k/QCA4019/hw1.0/firmware-5.bin \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin endef -$(eval $(call BuildPackage,ath10k-firmware-qca4019)) +# $(eval $(call BuildPackage,ath10k-firmware-qca4019)) Package/ath10k-firmware-qca9887 = $(call Package/firmware-default,ath10k qca9887 firmware) define Package/ath10k-firmware-qca9887/install diff --git a/package/lean/luci-app-mtwifi/Makefile b/package/lean/luci-app-mtwifi/Makefile index ad994c60a3..c0b0b39562 100644 --- a/package/lean/luci-app-mtwifi/Makefile +++ b/package/lean/luci-app-mtwifi/Makefile @@ -4,7 +4,7 @@ PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Hua Shao LUCI_TITLE:=LuCI support for mt wifi driver -LUCI_DEPENDS:=@TARGET_ramips +LUCI_DEPENDS:=@TARGET_ramips +kmod-mt_wifi LUCI_PKGARCH:=all PKG_VERSION:=2 PKG_RELEASE:=1 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index edb88336b7..698ab36214 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -705,7 +705,7 @@ define Device/phicomm_k2p DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2P SUPPORTED_DEVICES += k2p - DEVICE_PACKAGES := kmod-mt_wifi luci-app-mtwifi + DEVICE_PACKAGES := luci-app-mtwifi endef TARGET_DEVICES += phicomm_k2p @@ -909,7 +909,7 @@ define Device/xiaomi_mir3p IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport \ - kmod-mt_wifi luci-app-mtwifi uboot-envtools + luci-app-mtwifi uboot-envtools endef TARGET_DEVICES += xiaomi_mir3p