Skip to content

Commit

Permalink
wtf
Browse files Browse the repository at this point in the history
  • Loading branch information
yury-sannikov committed Feb 19, 2024
1 parent 6db97a5 commit d50960a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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
Expand Down Expand Up @@ -98,14 +98,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
- name: Build amneziawg-tools
run: |
make V=s package/amnezia-wg-tools/{clean,download,prepare}
make V=s package/amnezia-wg-tools/compile
make V=s package/amneziawg-tools/{clean,download,prepare}
make V=s package/amneziawg-tools/compile
- name: Build kmod-amneziawg
run: |
Expand All @@ -122,7 +122,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
Expand Down
10 changes: 5 additions & 5 deletions amnezia-wg-tools/Makefile → amneziawg-tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

include $(TOPDIR)/rules.mk

PKG_NAME:=amnezia-wg-tools
PKG_NAME:=amneziawg-tools

PKG_VERSION:=1.0.20240213
PKG_RELEASE:=$(AUTORELEASE)
Expand All @@ -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 <[email protected]>
Expand All @@ -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
Expand All @@ -48,12 +48,12 @@ 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/
$(INSTALL_DIR) $(1)/lib/netifd/proto/
$(INSTALL_BIN) ./files/amneziawg.sh $(1)/lib/netifd/proto/
endef

$(eval $(call BuildPackage,amnezia-wg-tools))
$(eval $(call BuildPackage,amneziawg-tools))
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

WG=/usr/bin/amneziawg
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
fi

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion luci-app-amneziawg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk

LUCI_TITLE:=Support for AmneziaWG VPN
LUCI_DEPENDS:=+amnezia-wg-tools +ucode
LUCI_DEPENDS:=+amneziawg-tools +ucode
LUCI_PKGARCH:=all

PKG_PROVIDES:=luci-app-amneziawg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ return network.registerProtocol('amneziawg', {
},

getOpkgPackage: function() {
return 'amnezia-wg-tools';
return 'amneziawg-tools';
},

isFloating: function() {
Expand Down

0 comments on commit d50960a

Please sign in to comment.