From 39bef8dbbb4b5b099a7aeacb75d2498b1bc7473b Mon Sep 17 00:00:00 2001 From: Yury Sannikov Date: Mon, 22 Jan 2024 01:23:28 +0300 Subject: [PATCH] rename module --- .github/workflows/build-module.yml | 14 +++++++------- {amnezia-wg-tools => amneziawg-tools}/Makefile | 12 ++++++------ .../files/amneziawg.sh | 0 .../files/amneziawg_watchdog | 0 4 files changed, 13 insertions(+), 13 deletions(-) rename {amnezia-wg-tools => amneziawg-tools}/Makefile (86%) rename {amnezia-wg-tools => amneziawg-tools}/files/amneziawg.sh (100%) rename {amnezia-wg-tools => amneziawg-tools}/files/amneziawg_watchdog (100%) diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml index 08f1d210..ef6a55c5 100644 --- a/.github/workflows/build-module.yml +++ b/.github/workflows/build-module.yml @@ -65,7 +65,7 @@ jobs: echo "CONFIG_ALL_KMODS=y" >> .config echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config - echo "CONFIG_PACKAGE_amnezia-wg-tools=y" >> .config + echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config @@ -97,14 +97,14 @@ jobs: ./scripts/feeds install -a -p awgopenwrt echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config - echo "CONFIG_PACKAGE_amnezia-wg-tools=y" >> .config + echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config make defconfig - # - name: Build amnezia-wg-tools - # run: | - # make V=s package/amnezia-wg-tools/{clean,download,prepare} - # make V=s package/amnezia-wg-tools/compile + - name: Build amneziawg-tools + run: | + make V=s package/amneziawg-tools/{clean,download,prepare} + make V=s package/amneziawg-tools/compile - name: Build kmod-amneziawg run: | @@ -121,7 +121,7 @@ jobs: tag_name=${{ github.ref_name }} mkdir -p awgrelease postfix="${tag_name}_${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}" - cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amnezia-wg-tools_*.ipk awgrelease/amnezia-wg-tools_${postfix}.ipk + cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${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 diff --git a/amnezia-wg-tools/Makefile b/amneziawg-tools/Makefile similarity index 86% rename from amnezia-wg-tools/Makefile rename to amneziawg-tools/Makefile index c1d7fab6..2d3286d7 100644 --- a/amnezia-wg-tools/Makefile +++ b/amneziawg-tools/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=amnezia-wg-tools +PKG_NAME:=amneziawg-tools PKG_VERSION:=0.0.1-kmod PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/amnezia-vpn/amnezia-wg-tools/archive/refs/tags/ +PKG_SOURCE_URL:=https://github.com/amnezia-vpn/amneziawg-tools/archive/refs/tags/ PKG_HASH:=cc4f523f7ec171b7bb3bdd1bcf4ff2f6833364fab6cad309310a84f33eeafa9b PKG_LICENSE:=GPL-2.0 @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk MAKE_PATH:=src MAKE_VARS += PLATFORM=linux -define Package/amnezia-wg-tools +define Package/amneziawg-tools CATEGORY:=Network URL:=https://www.wireguard.com MAINTAINER:=Jason A. Donenfeld @@ -36,7 +36,7 @@ define Package/amnezia-wg-tools +@BUSYBOX_CONFIG_FEATURE_IP_LINK endef -define Package/amnezia-wg-tools/description +define Package/amneziawg-tools/description WireGuard is a novel VPN that runs inside the Linux Kernel and utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPSec, while avoiding the massive headache. It intends to @@ -48,7 +48,7 @@ define Package/amnezia-wg-tools/description `wg(8)`, a netifd protocol helper, and a re-resolve watchdog script. endef -define Package/amnezia-wg-tools/install +define Package/amneziawg-tools/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wg $(1)/usr/bin/amneziawg $(INSTALL_BIN) ./files/amneziawg_watchdog $(1)/usr/bin/ @@ -56,4 +56,4 @@ define Package/amnezia-wg-tools/install $(INSTALL_BIN) ./files/amneziawg.sh $(1)/lib/netifd/proto/ endef -$(eval $(call BuildPackage,amnezia-wg-tools)) \ No newline at end of file +$(eval $(call BuildPackage,amneziawg-tools)) \ No newline at end of file diff --git a/amnezia-wg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh similarity index 100% rename from amnezia-wg-tools/files/amneziawg.sh rename to amneziawg-tools/files/amneziawg.sh diff --git a/amnezia-wg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog similarity index 100% rename from amnezia-wg-tools/files/amneziawg_watchdog rename to amneziawg-tools/files/amneziawg_watchdog