This commit is contained in:
Yury Sannikov
2024-02-20 00:17:25 +03:00
parent 6db97a5abc
commit d50960a678
6 changed files with 14 additions and 14 deletions

View File

@@ -66,7 +66,7 @@ jobs:
echo "CONFIG_ALL_KMODS=y" >> .config echo "CONFIG_ALL_KMODS=y" >> .config
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .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_luci-app-amneziawg=y" >> .config
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
@@ -98,14 +98,14 @@ jobs:
./scripts/feeds install -a -p awgopenwrt ./scripts/feeds install -a -p awgopenwrt
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .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_luci-app-amneziawg=y" >> .config
make defconfig make defconfig
- name: Build amnezia-wg-tools - name: Build amneziawg-tools
run: | run: |
make V=s package/amnezia-wg-tools/{clean,download,prepare} make V=s package/amneziawg-tools/{clean,download,prepare}
make V=s package/amnezia-wg-tools/compile make V=s package/amneziawg-tools/compile
- name: Build kmod-amneziawg - name: Build kmod-amneziawg
run: | run: |
@@ -122,7 +122,7 @@ jobs:
tag_name=${{ github.ref_name }} tag_name=${{ github.ref_name }}
mkdir -p awgrelease mkdir -p awgrelease
postfix="${tag_name}_${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}" 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/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/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk

View File

@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=amnezia-wg-tools PKG_NAME:=amneziawg-tools
PKG_VERSION:=1.0.20240213 PKG_VERSION:=1.0.20240213
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
MAKE_PATH:=src MAKE_PATH:=src
MAKE_VARS += PLATFORM=linux MAKE_VARS += PLATFORM=linux
define Package/amnezia-wg-tools define Package/amneziawg-tools
CATEGORY:=Network CATEGORY:=Network
URL:=https://www.wireguard.com URL:=https://www.wireguard.com
MAINTAINER:=Jason A. Donenfeld <Jason@zx2c4.com> MAINTAINER:=Jason A. Donenfeld <Jason@zx2c4.com>
@@ -36,7 +36,7 @@ define Package/amnezia-wg-tools
+@BUSYBOX_CONFIG_FEATURE_IP_LINK +@BUSYBOX_CONFIG_FEATURE_IP_LINK
endef 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 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 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 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. `wg(8)`, a netifd protocol helper, and a re-resolve watchdog script.
endef endef
define Package/amnezia-wg-tools/install define Package/amneziawg-tools/install
$(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wg $(1)/usr/bin/amneziawg $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wg $(1)/usr/bin/amneziawg
$(INSTALL_BIN) ./files/amneziawg_watchdog $(1)/usr/bin/ $(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/ $(INSTALL_BIN) ./files/amneziawg.sh $(1)/lib/netifd/proto/
endef endef
$(eval $(call BuildPackage,amnezia-wg-tools)) $(eval $(call BuildPackage,amneziawg-tools))

View File

@@ -4,7 +4,7 @@
WG=/usr/bin/amneziawg WG=/usr/bin/amneziawg
if [ ! -x $WG ]; then if [ ! -x $WG ]; then
logger -t "amnezia-wg" "error: missing amnezia-wg-tools (${WG})" logger -t "amnezia-wg" "error: missing amneziawg-tools (${WG})"
exit 0 exit 0
fi fi

View File

@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Support for AmneziaWG VPN LUCI_TITLE:=Support for AmneziaWG VPN
LUCI_DEPENDS:=+amnezia-wg-tools +ucode LUCI_DEPENDS:=+amneziawg-tools +ucode
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_PROVIDES:=luci-app-amneziawg PKG_PROVIDES:=luci-app-amneziawg

View File

@@ -124,7 +124,7 @@ return network.registerProtocol('amneziawg', {
}, },
getOpkgPackage: function() { getOpkgPackage: function() {
return 'amnezia-wg-tools'; return 'amneziawg-tools';
}, },
isFloating: function() { isFloating: function() {