Merge branch 'wireguard' into 'master'

user/wireguard-module: New packages for easy-kernel-power8*

Depends on MR 174.

See merge request !175

3 files changed, 83 insertions, 7 deletions

diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD
new file mode 100644
index 000000000..09a54843d
--- /dev/null
+++ b/user/wireguard-module-power8-64k/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: Luis Ressel <aranea@aixah.de>
+# KEEP THIS IN SYNC with the other wireguard-module packages.
+_kflavour="-power8-64k"
+_kver="4.14.88-mc13"
+pkgver=0.0.20190123
+pkgrel=0
+_pkgname="wireguard-module$_kflavour"
+pkgname="$_pkgname-$_kver"
+_pkgreal="WireGuard"
+pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
+url="https://www.wireguard.com/"
+arch="ppc64"
+options="!check !dbg !strip" # no test suite
+license="GPL-2.0-only"
+provides="$_pkgname=$pkgver"
+depends="easy-kernel$_kflavour-modules-$_kver"
+makedepends="easy-kernel$_kflavour-src-$_kver"
+source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$builddir"
+	sed -i -e '/depmod/d' src/Makefile # temporary hack
+}
+
+build() {
+	cd "$builddir"
+	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
+}
+
+package() {
+	cd "$builddir"
+	make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
+}
+
+sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59  WireGuard-0.0.20190123.tar.xz"
diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD
new file mode 100644
index 000000000..0619c09a4
--- /dev/null
+++ b/user/wireguard-module-power8/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: Luis Ressel <aranea@aixah.de>
+# KEEP THIS IN SYNC with the other wireguard-module packages.
+_kflavour="-power8"
+_kver="4.14.88-mc13"
+pkgver=0.0.20190123
+pkgrel=0
+_pkgname="wireguard-module$_kflavour"
+pkgname="$_pkgname-$_kver"
+_pkgreal="WireGuard"
+pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
+url="https://www.wireguard.com/"
+arch="ppc64"
+options="!check !dbg !strip" # no test suite
+license="GPL-2.0-only"
+provides="$_pkgname=$pkgver"
+depends="easy-kernel$_kflavour-modules-$_kver"
+makedepends="easy-kernel$_kflavour-src-$_kver"
+source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$builddir"
+	sed -i -e '/depmod/d' src/Makefile # temporary hack
+}
+
+build() {
+	cd "$builddir"
+	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
+}
+
+package() {
+	cd "$builddir"
+	make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
+}
+
+sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59  WireGuard-0.0.20190123.tar.xz"
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index b1801f7f1..d5c59a7b9 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,10 +1,12 @@
 # Contributor: Luis Ressel <aranea@aixah.de>
 # Maintainer: Luis Ressel <aranea@aixah.de>
-_kernelver="4.14.88-mc13"
+# KEEP THIS IN SYNC with the other wireguard-module packages.
+_kflavour=""
+_kver="4.14.88-mc13"
 pkgver=0.0.20190123
 pkgrel=0
-_pkgname="wireguard-module"
-pkgname="$_pkgname-$_kernelver"
+_pkgname="wireguard-module$_kflavour"
+pkgname="$_pkgname-$_kver"
 _pkgreal="WireGuard"
 pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
 url="https://www.wireguard.com/"
@@ -12,8 +14,8 @@ arch="all"
 options="!check !dbg !strip" # no test suite
 license="GPL-2.0-only"
 provides="$_pkgname=$pkgver"
-depends="easy-kernel-modules-$_kernelver"
-makedepends="easy-kernel-src-$_kernelver"
+depends="easy-kernel$_kflavour-modules-$_kver"
+makedepends="easy-kernel$_kflavour-src-$_kver"
 source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
@@ -24,12 +26,12 @@ prepare() {
 
 build() {
 	cd "$builddir"
-	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kernelver" module
+	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
 }
 
 package() {
 	cd "$builddir"
-	make -C src KERNELDIR="/usr/src/linux-$_kernelver" INSTALL_MOD_PATH="$pkgdir" module-install
+	make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
 }
 
 sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59  WireGuard-0.0.20190123.tar.xz"