From 582584d7bcffdb6ad70221c41f0b1b0765cfe00d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 16 Aug 2018 06:18:43 +0000
Subject: system/easy-kernel: UAPI fix for linux-headers

---
 system/easy-kernel/APKBUILD                 |  4 +++-
 system/easy-kernel/revert-broken-uapi.patch | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 system/easy-kernel/revert-broken-uapi.patch

(limited to 'system/easy-kernel')

diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index e355ad1a3..4a9395acd 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -22,7 +22,8 @@ source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 	config-ppc
 	config-x86_64
 	config-pmmx
-	config-aarch64"
+	config-aarch64
+	"
 builddir="$srcdir/linux-4.14"
 
 prepare() {
@@ -78,6 +79,7 @@ modules() {
 headers() {
 	pkgdesc="System headers provided by the Linux kernel"
 	cd "$builddir"
+	patch -Np1 -i "$srcdir"/../revert-broken-uapi.patch
 
 	mkdir -p "$subpkgdir"/usr
 	make headers_install INSTALL_HDR_PATH="$subpkgdir/usr"
diff --git a/system/easy-kernel/revert-broken-uapi.patch b/system/easy-kernel/revert-broken-uapi.patch
new file mode 100644
index 000000000..186ef7196
--- /dev/null
+++ b/system/easy-kernel/revert-broken-uapi.patch
@@ -0,0 +1,18 @@
+Revert 1fe8e0f074c77aa41aaa579345a9e675acbebfa9
+diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
+index 1046f55..777b6cd 100644
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -2,9 +2,6 @@
+ #define _UAPI_IF_TUNNEL_H_
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>
+-#include <linux/ip.h>
+-#include <linux/in6.h>
+ #include <asm/byteorder.h>
+ 
+ 
+-- 
+cgit v1.1
+
-- 
cgit v1.2.3-60-g2f50