summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2021-02-23 19:01:59 -0800
committerMichael Forney <mforney@mforney.org>2021-03-02 16:20:17 -0800
commitd640328f5aac575a4199e88eb11eac0cd5261f4c (patch)
tree74af6c39c425db78e3bd107a0d1e23f8f0205911
parent9a2d7b14635f047f326a234d14aa02a33ead1429 (diff)
linux-headers: Update to 5.11
-rw-r--r--pkg/linux-headers/.gitignore2
-rw-r--r--pkg/linux-headers/base.lua9
-rw-r--r--pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch8
-rw-r--r--pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch26
-rw-r--r--pkg/linux-headers/sha2562
-rw-r--r--pkg/linux-headers/url2
-rw-r--r--pkg/linux-headers/ver2
-rw-r--r--pkg/linux-headers/x86.lua1
8 files changed, 14 insertions, 38 deletions
diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore
index c02e47d6..46f074e7 100644
--- a/pkg/linux-headers/.gitignore
+++ b/pkg/linux-headers/.gitignore
@@ -1,3 +1,3 @@
-/linux-5.10.tar.xz
+/linux-5.11.tar.xz
/src
/tools.ninja
diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua
index 8408ab68..0c2fc4ef 100644
--- a/pkg/linux-headers/base.lua
+++ b/pkg/linux-headers/base.lua
@@ -144,9 +144,11 @@ return {
'linux/cdrom.h',
'linux/cec-funcs.h',
'linux/cec.h',
+ 'linux/cfm_bridge.h',
'linux/cgroupstats.h',
'linux/chio.h',
'linux/cifs/cifs_mount.h',
+ 'linux/cifs/cifs_netlink.h',
'linux/close_range.h',
'linux/cm4000_cs.h',
'linux/cn_proc.h',
@@ -194,6 +196,7 @@ return {
'linux/ethtool.h',
'linux/ethtool_netlink.h',
'linux/eventpoll.h',
+ 'linux/f2fs.h',
'linux/fadvise.h',
'linux/falloc.h',
'linux/fanotify.h',
@@ -258,7 +261,6 @@ return {
'linux/if_ether.h',
'linux/if_fc.h',
'linux/if_fddi.h',
- 'linux/if_frad.h',
'linux/if_hippi.h',
'linux/if_infiniband.h',
'linux/if_link.h',
@@ -601,12 +603,14 @@ return {
'linux/rfkill.h',
'linux/rio_cm_cdev.h',
'linux/rio_mport_cdev.h',
+ 'linux/rkisp1-config.h',
'linux/romfs_fs.h',
'linux/rose.h',
'linux/route.h',
'linux/rpl.h',
'linux/rpl_iptunnel.h',
'linux/rpmsg.h',
+ 'linux/rpmsg_types.h',
'linux/rseq.h',
'linux/rtc.h',
'linux/rtnetlink.h',
@@ -617,7 +621,6 @@ return {
'linux/scif_ioctl.h',
'linux/screen_info.h',
'linux/sctp.h',
- 'linux/sdla.h',
'linux/seccomp.h',
'linux/securebits.h',
'linux/sed-opal.h',
@@ -784,8 +787,6 @@ return {
'linux/wait.h',
'linux/watch_queue.h',
'linux/watchdog.h',
- 'linux/wimax.h',
- 'linux/wimax/i2400m.h',
'linux/wireguard.h',
'linux/wireless.h',
'linux/wmi.h',
diff --git a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch
index d17ab407..ea8a881b 100644
--- a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch
+++ b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch
@@ -1,4 +1,4 @@
-From 06db5d14eec467c54a3a5f3aa03cc222271ef76b Mon Sep 17 00:00:00 2001
+From 6a41b5bb9244d4b6b1e74ac2074fff37d93d234b Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 2 Jun 2020 03:56:03 -0700
Subject: [PATCH] Revert change of BPF_F_* to enum constants
@@ -8,10 +8,10 @@ Subject: [PATCH] Revert change of BPF_F_* to enum constants
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
-index b6238b2209b7..1f78be710fba 100644
+index 77d7c1bb2923..364d4d58ceb8 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
-@@ -3604,12 +3604,10 @@ enum {
+@@ -4060,12 +4060,10 @@ enum {
/* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
* BPF_FUNC_perf_event_read_value flags.
*/
@@ -28,5 +28,5 @@ index b6238b2209b7..1f78be710fba 100644
/* Current network namespace */
enum {
--
-2.28.0
+2.30.0
diff --git a/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch b/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch
deleted file mode 100644
index d35d32b7..00000000
--- a/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2cea39d1a37c87e65e3bc8892f9d3d37e426b9e7 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 23 Jun 2020 14:34:45 -0700
-Subject: [PATCH] Only include linux/sysinfo.h from linux/kernel.h on glibc
-
----
- include/uapi/linux/kernel.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
-index 0ff8f7477847..b2d59deef093 100644
---- a/include/uapi/linux/kernel.h
-+++ b/include/uapi/linux/kernel.h
-@@ -2,7 +2,9 @@
- #ifndef _UAPI_LINUX_KERNEL_H
- #define _UAPI_LINUX_KERNEL_H
-
-+#ifdef __GLIBC__
- #include <linux/sysinfo.h>
-+#endif
-
- /*
- * 'kernel.h' contains some often-used function prototypes etc
---
-2.27.0
-
diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256
index d855c43d..2ec53310 100644
--- a/pkg/linux-headers/sha256
+++ b/pkg/linux-headers/sha256
@@ -1 +1 @@
-dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 linux-5.10.tar.xz
+04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 linux-5.11.tar.xz
diff --git a/pkg/linux-headers/url b/pkg/linux-headers/url
index c25c8894..d80cacdf 100644
--- a/pkg/linux-headers/url
+++ b/pkg/linux-headers/url
@@ -1 +1 @@
-url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz"
+url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz"
diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver
index 9acd1b67..485fb764 100644
--- a/pkg/linux-headers/ver
+++ b/pkg/linux-headers/ver
@@ -1 +1 @@
-5.10 r0
+5.11 r0
diff --git a/pkg/linux-headers/x86.lua b/pkg/linux-headers/x86.lua
index 63f796b6..d25e53af 100644
--- a/pkg/linux-headers/x86.lua
+++ b/pkg/linux-headers/x86.lua
@@ -31,6 +31,7 @@ return {
'asm/ptrace.h',
'asm/sembuf.h',
'asm/setup.h',
+ 'asm/sgx.h',
'asm/shmbuf.h',
'asm/sigcontext.h',
'asm/sigcontext32.h',