From cd27feb7b3b45fca43e2260e1da156d94a13907b Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 27 Feb 2017 21:27:11 -0800 Subject: create-patch: add context below to work with busybox patch It turns out that GNU patch is happy to only have one line of context above the inserted area and zero lines below, because of its fuzzy match feature. However, busybox patch is crippled and terrible, and thus must have context above and below the insertion point. So, we grudgingly add it to our manually crafted minimal patch. --- contrib/kernel-tree/create-patch.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/kernel-tree/create-patch.sh b/contrib/kernel-tree/create-patch.sh index ee4bc02..3f913ae 100755 --- a/contrib/kernel-tree/create-patch.sh +++ b/contrib/kernel-tree/create-patch.sh @@ -9,12 +9,14 @@ done cat <<_EOF --- a/net/Kconfig +++ b/net/Kconfig -@@ -85,1 +85,2 @@ config INET +@@ -85,2 +85,3 @@ config INET if INET +source "net/wireguard/Kconfig" + source "net/ipv4/Kconfig" --- a/net/Makefile +++ b/net/Makefile -@@ -16,1 +16,2 @@ +@@ -16,2 +16,3 @@ obj-\$(CONFIG_NETFILTER) += netfilter/ +obj-\$(CONFIG_WIREGUARD) += wireguard/ + obj-\$(CONFIG_INET) += ipv4/ _EOF -- cgit v1.2.3-59-g8ed1b