summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2020-06-01 17:15:31 -0700
committerMichael Forney <mforney@mforney.org>2020-06-02 04:03:29 -0700
commitf8cea8cf73bfbb961668f66e3cd037232ebb3340 (patch)
treef84ef1c242de584a2ba034f5c0afd07ebee15d43 /pkg
parent88ca4f8ade07aa5db8348b0d4bad0a699ba84e09 (diff)
linux-headers: Update to 5.7
Diffstat (limited to 'pkg')
-rw-r--r--pkg/linux-headers/.gitignore2
-rw-r--r--pkg/linux-headers/base.lua7
-rw-r--r--pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch32
-rw-r--r--pkg/linux-headers/sha2562
-rw-r--r--pkg/linux-headers/url2
-rw-r--r--pkg/linux-headers/ver2
6 files changed, 43 insertions, 4 deletions
diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore
index cb9b4150..574a727e 100644
--- a/pkg/linux-headers/.gitignore
+++ b/pkg/linux-headers/.gitignore
@@ -1,3 +1,3 @@
-/linux-5.6.tar.xz
+/linux-5.7.tar.xz
/src
/tools.ninja
diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua
index fe96c59f..d7bcddb0 100644
--- a/pkg/linux-headers/base.lua
+++ b/pkg/linux-headers/base.lua
@@ -357,6 +357,7 @@ return {
'linux/mount.h',
'linux/mpls.h',
'linux/mpls_iptunnel.h',
+ 'linux/mptcp.h',
'linux/mqueue.h',
'linux/mroute.h',
'linux/mroute6.h',
@@ -600,6 +601,8 @@ return {
'linux/romfs_fs.h',
'linux/rose.h',
'linux/route.h',
+ 'linux/rpl.h',
+ 'linux/rpl_iptunnel.h',
'linux/rpmsg.h',
'linux/rseq.h',
'linux/rtc.h',
@@ -706,6 +709,7 @@ return {
'linux/uio.h',
'linux/uleds.h',
'linux/ultrasound.h',
+ 'linux/um_timetravel.h',
'linux/un.h',
'linux/unistd.h',
'linux/unix_diag.h',
@@ -720,6 +724,7 @@ return {
'linux/usb/g_uvc.h',
'linux/usb/gadgetfs.h',
'linux/usb/midi.h',
+ 'linux/usb/raw_gadget.h',
'linux/usb/tmc.h',
'linux/usb/video.h',
'linux/usbdevice_fs.h',
@@ -789,6 +794,8 @@ return {
'misc/habanalabs.h',
'misc/ocxl.h',
'misc/pvpanic.h',
+ 'misc/uacce/hisi_qm.h',
+ 'misc/uacce/uacce.h',
'misc/xilinx_sdfec.h',
'mtd/inftl-user.h',
'mtd/mtd-abi.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
new file mode 100644
index 00000000..c448f6a8
--- /dev/null
+++ b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch
@@ -0,0 +1,32 @@
+From c4b453a81c19709e118c8f3fdbb1153af9a879f0 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
+
+---
+ include/uapi/linux/bpf.h | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
+index f9b7fdd951e4..91d6a5e43ccd 100644
+--- a/include/uapi/linux/bpf.h
++++ b/include/uapi/linux/bpf.h
+@@ -3216,12 +3216,10 @@ enum {
+ /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
+ * BPF_FUNC_perf_event_read_value flags.
+ */
+-enum {
+- BPF_F_INDEX_MASK = 0xffffffffULL,
+- BPF_F_CURRENT_CPU = BPF_F_INDEX_MASK,
++#define BPF_F_INDEX_MASK 0xffffffffULL
++#define BPF_F_CURRENT_CPU BPF_F_INDEX_MASK
+ /* BPF_FUNC_perf_event_output for sk_buff input context. */
+- BPF_F_CTXLEN_MASK = (0xfffffULL << 32),
+-};
++#define BPF_F_CTXLEN_MASK (0xfffffULL << 32)
+
+ /* Current network namespace */
+ enum {
+--
+2.27.0
+
diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256
index fbfcfcc7..f5c277c6 100644
--- a/pkg/linux-headers/sha256
+++ b/pkg/linux-headers/sha256
@@ -1 +1 @@
-e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622 linux-5.6.tar.xz
+de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0 linux-5.7.tar.xz
diff --git a/pkg/linux-headers/url b/pkg/linux-headers/url
index 21f56161..7ed2d2bf 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.6.tar.xz"
+url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz"
diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver
index c88094bd..4ca01b27 100644
--- a/pkg/linux-headers/ver
+++ b/pkg/linux-headers/ver
@@ -1 +1 @@
-5.6 r0
+5.7 r0