From a466a232a36a4a08666af2ac91d2b6eb9d170803 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 28 Jul 2016 15:42:03 +0200
Subject: contrib: move patchers to contrib/kernel-tree

---
 contrib/kernel-tree/create-patch.sh | 20 ++++++++++++++++++++
 contrib/kernel-tree/jerry-rig.sh    | 12 ++++++++++++
 contrib/patch-kernel-builtin.sh     | 12 ------------
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100755 contrib/kernel-tree/create-patch.sh
 create mode 100755 contrib/kernel-tree/jerry-rig.sh
 delete mode 100755 contrib/patch-kernel-builtin.sh

diff --git a/contrib/kernel-tree/create-patch.sh b/contrib/kernel-tree/create-patch.sh
new file mode 100755
index 0000000..93b7bed
--- /dev/null
+++ b/contrib/kernel-tree/create-patch.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../../src/")"
+
+for i in "$WG"/*.c "$WG"/*.h "$WG"/crypto/*.c "$WG"/crypto/*.h "$WG"/crypto/*.S "$WG"/Kbuild "$WG"/Kconfig; do
+	diff -u /dev/null "$i" | sed "s:${WG}:b/net/wireguard:;s:Kbuild:Makefile:"
+done
+
+cat <<_EOF
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -85,1 +85,2 @@ config INET
+ if INET
++source "net/wireguard/Kconfig"
+--- a/net/Makefile
++++ b/net/Makefile
+@@ -8,1 +8,2 @@
+ obj-\$(CONFIG_NET)		:= socket.o core/
++obj-\$(CONFIG_WIREGUARD)		+= wireguard/
+_EOF
diff --git a/contrib/kernel-tree/jerry-rig.sh b/contrib/kernel-tree/jerry-rig.sh
new file mode 100755
index 0000000..3d4139a
--- /dev/null
+++ b/contrib/kernel-tree/jerry-rig.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+K="$1"
+WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../../src/")"
+
+if [[ ! -e $K/net/Kconfig ]]; then
+	echo "You must specify the location of kernel sources as the first argument." >&2
+	exit 1
+fi
+
+sed -i "/^if INET\$/a source \"$WG/Kconfig\"" "$K/net/Kconfig"
+echo "obj-y += ../../../../../../../../../../../../../../../../../../../../../..$WG/" >> "$K/net/Makefile"
diff --git a/contrib/patch-kernel-builtin.sh b/contrib/patch-kernel-builtin.sh
deleted file mode 100755
index 65cb489..0000000
--- a/contrib/patch-kernel-builtin.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-K="$1"
-WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../src/")"
-
-if [[ ! -e $K/net/Kconfig ]]; then
-	echo "You must specify the location of kernel sources as the first argument." >&2
-	exit 1
-fi
-
-sed -i "/^if INET\$/a source \"$WG/Kconfig\"" "$K/net/Kconfig"
-echo "obj-y += ../../../../../../../../../../../../../../../../../../../../../..$WG/" >> "$K/net/Makefile"
-- 
cgit v1.2.3-59-g8ed1b