Skip to content

Commit

Permalink
Remove wireguard-tools from wireguard (#784)
Browse files Browse the repository at this point in the history
* Remove wireguard-tools from wireguard and mark it as depending on wireguard-tools

* Dropping wireguard-tools as entware has it and wg-quick already
  • Loading branch information
Eeems committed Dec 16, 2023
1 parent 9e481a5 commit e7c8bfb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 51 deletions.
32 changes: 0 additions & 32 deletions package/wireguard-tools/package

This file was deleted.

21 changes: 2 additions & 19 deletions package/wireguard/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
pkgnames=(wireguard)
pkgdesc="Fast, modern, secure VPN tunnel"
url=https://www.wireguard.com
pkgver=1.0.20210219-3
_wireguardtoolsver=1.0.20210223
pkgver=1.0.20210219-4
timestamp=2021-02-19T14:08Z
section=kernel
maintainer="Jonah Weissman <[email protected]>"
license=GPL-2.0-only
makedepends=(build:bc build:lzop build:git)
flags=(nostrip)
provides=(wireguard-tools)
installdepends=(wireguard-tools)

_kernelrepo=https://github.com/remarkable/linux
_kernelrevs=(
Expand All @@ -28,28 +27,14 @@ _defconfigs=(
image=base:v2.1
source=(
"https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver%-*}.tar.xz"
"https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${_wireguardtoolsver}.tar.xz"
fix-multiple-yylloc-definitions.patch
)
noextract=("wireguard-tools-${_wireguardtoolsver}.tar.xz")
sha256sums=(
99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00
1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c
SKIP
)

prepare() {
bsdtar -x \
--directory "$srcdir" \
--file "$srcdir/wireguard-tools-${_wireguardtoolsver}.tar.xz"
mv "$srcdir/wireguard-tools-${_wireguardtoolsver}" "$srcdir/wireguard-tools"
# the symlink at src/wg-quick/wg needs something to point to
touch "$srcdir/wireguard-tools/src/wg"
}

build() {
make -C wireguard-tools/src PLATFORM=linux "CC=${CROSS_COMPILE}cc"

mkdir pkg
git init linux
for i in $(seq 0 1); do
Expand Down Expand Up @@ -81,8 +66,6 @@ build() {
}

package() {
make -C "$srcdir/wireguard-tools/src" DESTDIR="$pkgdir" WITH_WGQUICK=yes \
WITH_SYSTEMDUNITS=yes WITH_BASHCOMPLETION=no install
mkdir -p "$pkgdir/lib/modules"
cp -r "$srcdir/pkg"/* "$pkgdir/lib/modules"
}
Expand Down

0 comments on commit e7c8bfb

Please sign in to comment.