commit wireguard-git 0.0.20161129.r4.gb70677f-1

3 files changed, 7 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34c34f7eae8a..76809fa919d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec  5 09:35:30 UTC 2016
+# Tue Dec  6 20:08:56 UTC 2016
 pkgbase = wireguard-git
 	pkgdesc = next generation secure network tunnel - git checkout
-	pkgver = 0.0.20161129.r3.ge029184
+	pkgver = 0.0.20161129.r4.gb70677f
 	pkgrel = 1
 	url = http://www.wireguard.io/
 	arch = x86_64
@@ -11,9 +11,7 @@ pkgbase = wireguard-git
 	makedepends = git
 	makedepends = libmnl
 	source = git+https://git.zx2c4.com/WireGuard
-	source = dkms.conf
 	sha256sums = SKIP
-	sha256sums = f34dced05d2b1d9713da12eeef02e71db213646a4c8f6852227430bd84127433
 
 pkgname = wireguard-dkms-git
 	depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index 5fd06e1ef6c1..d926dda6f7b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,15 @@
 
 pkgbase=wireguard-git
 pkgname=(wireguard-dkms-git wireguard-tools-git)
-pkgver=0.0.20161129.r3.ge029184
+pkgver=0.0.20161129.r4.gb70677f
 pkgrel=1
 pkgdesc='next generation secure network tunnel - git checkout'
 arch=('x86_64' 'i686')
 url='http://www.wireguard.io/'
 license=('GPL')
 makedepends=('git' 'libmnl')
-source=('git+https://git.zx2c4.com/WireGuard'
-	'dkms.conf')
-sha256sums=('SKIP'
-            'f34dced05d2b1d9713da12eeef02e71db213646a4c8f6852227430bd84127433')
+source=('git+https://git.zx2c4.com/WireGuard')
+sha256sums=('SKIP')
 
 pkgver() {
 	cd WireGuard/
@@ -32,8 +30,6 @@ pkgver() {
 prepare() {
 	cd WireGuard/
 
-	sed -i '/^include/d' src/Makefile
-
 	find contrib/examples/ -name '.gitignore' -delete
 }
 
@@ -48,13 +44,9 @@ package_wireguard-dkms-git() {
 	provides=('wireguard-dkms')
 	conflicts=('wireguard-dkms')
 
-	cd WireGuard/src/
+	cd WireGuard/
 
-	install -d -m0755 "${pkgdir}"/usr/src/wireguard-${pkgver}/{crypto,selftest}/
-	install -D -m0644 "${srcdir}"/dkms.conf "${pkgdir}"/usr/src/wireguard-${pkgver}/dkms.conf
-	install -m0644 Kbuild Kconfig Makefile *.c *.h "${pkgdir}"/usr/src/wireguard-${pkgver}/
-	install -m0644 crypto/* "${pkgdir}"/usr/src/wireguard-${pkgver}/crypto/
-	install -m0644 selftest/* "${pkgdir}"/usr/src/wireguard-${pkgver}/selftest/
+	make -C src/ DESTDIR="${pkgdir}/" DKMSDIR="/usr/src/wireguard-${pkgver}/" dkms-install
 }
 
 package_wireguard-tools-git() {
diff --git a/dkms.conf b/dkms.conf
deleted file mode 100644
index 8535afd0f56d..000000000000
--- a/dkms.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Linux DKMS config script for the WireGuard kernel module
-#
-
-PACKAGE_NAME="wireguard"
-PACKAGE_VERSION=0.0.0
-AUTOINSTALL=yes
-
-BUILT_MODULE_NAME="wireguard"
-DEST_MODULE_LOCATION="/kernel/net"
-