Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove wireguard-tools from wireguard #784

Merged
merged 4 commits into from
Dec 16, 2023
Merged

Remove wireguard-tools from wireguard #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24cd426
Remove wireguard-tools from wireguard and mark it as depending on wir…
Eeems Dec 10, 2023
3c30a89
Add epoch to wireguard-tools version
Eeems Dec 15, 2023
b4c878b
Fix build
Eeems Dec 15, 2023
4dd8799
Dropping wireguard-tools as entware has it and wg-quick already
Eeems Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions package/wireguard-tools/package
View file
Open in desktop

This file was deleted.

21 changes: 2 additions & 19 deletions package/wireguard/package
View file
Open in desktop
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