summaryrefslogtreecommitdiff
path: root/system/linux-headers
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-26 20:10:08 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-26 20:10:08 -0500
commitd5ccff21fd9a0d76a485f7340d541c2cbbc246c0 (patch)
treeaf14830a30b59f148413542b50cfc15e4cb4f51e /system/linux-headers
parent51ddb5d260f0900fd522c8823cf5bf68df6f934d (diff)
downloadpackages-d5ccff21fd9a0d76a485f7340d541c2cbbc246c0.tar.gz
packages-d5ccff21fd9a0d76a485f7340d541c2cbbc246c0.tar.bz2
packages-d5ccff21fd9a0d76a485f7340d541c2cbbc246c0.tar.xz
packages-d5ccff21fd9a0d76a485f7340d541c2cbbc246c0.zip
system/linux-headers: fix UAPI breakage, thanks @dalias
Diffstat (limited to 'system/linux-headers')
-rw-r--r--system/linux-headers/APKBUILD4
-rw-r--r--system/linux-headers/revert-broken-uapi.patch18
2 files changed, 21 insertions, 1 deletions
diff --git a/system/linux-headers/APKBUILD b/system/linux-headers/APKBUILD
index 9f39bf5b0..eb8aa4696 100644
--- a/system/linux-headers/APKBUILD
+++ b/system/linux-headers/APKBUILD
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
makedepends="perl"
source="https://kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz
+ revert-broken-uapi.patch
"
builddir="$srcdir/linux-4.14"
@@ -48,4 +49,5 @@ package() {
}
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
-3fe2da1714cc83d909ba43d27c7f22ef4f2a6ecfd91ff81e0e141a0dd742ec78ad11392186871762f410615ae7c7f33dd814e0f194c7f7aed1dee2d9fca0252d linux-4.14-mc8.patch.xz"
+3fe2da1714cc83d909ba43d27c7f22ef4f2a6ecfd91ff81e0e141a0dd742ec78ad11392186871762f410615ae7c7f33dd814e0f194c7f7aed1dee2d9fca0252d linux-4.14-mc8.patch.xz
+32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53 revert-broken-uapi.patch"
diff --git a/system/linux-headers/revert-broken-uapi.patch b/system/linux-headers/revert-broken-uapi.patch
new file mode 100644
index 000000000..186ef7196
--- /dev/null
+++ b/system/linux-headers/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
+