logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 30c8cf7b1636ad60a205399351d3686ab73f1a92
parent 8fc06e118ef7a4b23052a1c7c834aecaa0f1cab3
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 30 Aug 2021 20:53:12 -0700

linux-headers: Update to 5.14

Diffstat:

Mpkg/linux-headers/.gitignore2+-
Mpkg/linux-headers/base.lua7++++---
Mpkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch8++++----
Mpkg/linux-headers/sha2562+-
Mpkg/linux-headers/url2+-
Mpkg/linux-headers/ver2+-
6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore @@ -1,3 +1,3 @@ -/linux-5.13.tar.xz +/linux-5.14.tar.xz /src /tools.ninja diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua @@ -372,7 +372,6 @@ return { 'linux/msdos_fs.h', 'linux/msg.h', 'linux/mtio.h', - 'linux/n_r3964.h', 'linux/nbd-netlink.h', 'linux/nbd.h', 'linux/ncsi.h', @@ -405,6 +404,7 @@ return { 'linux/netfilter/nfnetlink_conntrack.h', 'linux/netfilter/nfnetlink_cthelper.h', 'linux/netfilter/nfnetlink_cttimeout.h', + 'linux/netfilter/nfnetlink_hook.h', 'linux/netfilter/nfnetlink_log.h', 'linux/netfilter/nfnetlink_osf.h', 'linux/netfilter/nfnetlink_queue.h', @@ -599,7 +599,6 @@ return { 'linux/raid/md_p.h', 'linux/raid/md_u.h', 'linux/random.h', - 'linux/raw.h', 'linux/rds.h', 'linux/reboot.h', 'linux/reiserfs_fs.h', @@ -783,6 +782,7 @@ return { 'linux/virtio_mmio.h', 'linux/virtio_net.h', 'linux/virtio_pci.h', + 'linux/virtio_pcidev.h', 'linux/virtio_pmem.h', 'linux/virtio_ring.h', 'linux/virtio_rng.h', @@ -802,6 +802,7 @@ return { 'linux/wireguard.h', 'linux/wireless.h', 'linux/wmi.h', + 'linux/wwan.h', 'linux/x25.h', 'linux/xattr.h', 'linux/xdp_diag.h', @@ -828,12 +829,12 @@ return { 'rdma/hfi/hfi1_ioctl.h', 'rdma/hfi/hfi1_user.h', 'rdma/hns-abi.h', - 'rdma/i40iw-abi.h', 'rdma/ib_user_ioctl_cmds.h', 'rdma/ib_user_ioctl_verbs.h', 'rdma/ib_user_mad.h', 'rdma/ib_user_sa.h', 'rdma/ib_user_verbs.h', + 'rdma/irdma-abi.h', 'rdma/mlx4-abi.h', 'rdma/mlx5-abi.h', 'rdma/mlx5_user_ioctl_cmds.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 @@ -1,4 +1,4 @@ -From 9529e62e156fcd491efb8464100339f0c66b0296 Mon Sep 17 00:00:00 2001 +From 5d59692ac21d659a7d8a08c49d83fef2399fff6f 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 4ba4ef0ff63a..2a6af1f960b9 100644 +index bf9252c7381e..3c32dfb895a3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -4146,12 +4146,10 @@ enum { +@@ -5016,12 +5016,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 4ba4ef0ff63a..2a6af1f960b9 100644 /* Current network namespace */ enum { -- -2.31.1 +2.32.0 diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256 @@ -1 +1 @@ -3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9 linux-5.13.tar.xz +7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2 linux-5.14.tar.xz diff --git a/pkg/linux-headers/url b/pkg/linux-headers/url @@ -1 +1 @@ -url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz" +url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz" diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver @@ -1 +1 @@ -5.13 r1 +5.14 r0