Refactoring

lolo6oT · Jan 29, 2024 · dda7662 · dda7662
1 parent 3f083cc
commit dda7662
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/openwrt-awg.yml b/.github/workflows/openwrt-awg.yml
@@ -72,7 +72,7 @@ jobs:
           cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
           cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-go_*.ipk awgrelease/amneziawg-go_${postfix}.ipk
           cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
-          cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
+          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
 
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/kmod-amneziawg/Makefile b/kmod-amneziawg/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/amneziawg
+define Package/amneziawg
 	SECTION:=kernel
 	CATEGORY:=Kernel modules
 	SUBMENU:=Network Support
@@ -37,4 +37,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,amneziawg))
+$(eval $(call Package,amneziawg))
diff --git a/luci-app-amneziawg/Makefile → luci-proto-amneziawg/Makefile b/luci-app-amneziawg/Makefile → luci-proto-amneziawg/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=Support for AmneziaWG VPN
 LUCI_DEPENDS:=+amneziawg-tools +ucode
 LUCI_PKGARCH:=all
 
-PKG_PROVIDES:=luci-app-amneziawg
+PKG_PROVIDES:=luci-proto-amneziawg
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

diff --git a/...ci-static/resources/protocol/amneziawg.js → ...ci-static/resources/protocol/amneziawg.js b/...ci-static/resources/protocol/amneziawg.js → ...ci-static/resources/protocol/amneziawg.js
diff --git a/...static/resources/view/amneziawg/status.js → ...static/resources/view/amneziawg/status.js b/...static/resources/view/amneziawg/status.js → ...static/resources/view/amneziawg/status.js
diff --git a/...are/luci/menu.d/luci-proto-amneziawg.json → ...are/luci/menu.d/luci-proto-amneziawg.json b/...are/luci/menu.d/luci-proto-amneziawg.json → ...are/luci/menu.d/luci-proto-amneziawg.json
diff --git a/.../usr/share/rpcd/acl.d/luci-amneziawg.json → .../usr/share/rpcd/acl.d/luci-amneziawg.json b/.../usr/share/rpcd/acl.d/luci-amneziawg.json → .../usr/share/rpcd/acl.d/luci-amneziawg.json
diff --git a/.../root/usr/share/rpcd/ucode/luci.amneziawg → .../root/usr/share/rpcd/ucode/luci.amneziawg b/.../root/usr/share/rpcd/ucode/luci.amneziawg → .../root/usr/share/rpcd/ucode/luci.amneziawg