logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 7a0f1ecc4e7b59ece9d98d070bbc06bc7f11ab86
parent 69f5d464bd5c5ebf0de25d08ef093dbcc1151948
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 21 Mar 2024 22:35:22 -0700

linux-headers: Update to 6.8

Diffstat:

Mpkg/linux-headers/.gitignore2+-
Mpkg/linux-headers/base.lua16++++++++++++++--
Mpkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch8++++----
Mpkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch10+++++-----
Dpkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch32--------------------------------
Rpkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch -> pkg/linux-headers/patch/0004-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch0
Mpkg/linux-headers/sha2562+-
Mpkg/linux-headers/url2+-
Mpkg/linux-headers/ver2+-
9 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore @@ -1,3 +1,3 @@ -/linux-6.4.tar.xz +/linux-6.8.tar.xz /src /tools.ninja diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua @@ -53,6 +53,7 @@ return { 'drm/nouveau_drm.h', 'drm/omap_drm.h', 'drm/panfrost_drm.h', + 'drm/pvr_drm.h', 'drm/qaic_accel.h', 'drm/qxl_drm.h', 'drm/radeon_drm.h', @@ -62,6 +63,7 @@ return { 'drm/vgem_drm.h', 'drm/virtgpu_drm.h', 'drm/vmwgfx_drm.h', + 'drm/xe_drm.h', 'linux/a.out.h', 'linux/acct.h', 'linux/acrn.h', @@ -117,7 +119,6 @@ return { 'linux/bpf.h', 'linux/bpf_common.h', 'linux/bpf_perf_event.h', - 'linux/bpfilter.h', 'linux/bpqether.h', 'linux/bsg.h', 'linux/bt-bmc.h', @@ -178,6 +179,7 @@ return { 'linux/dma-buf.h', 'linux/dma-heap.h', 'linux/dns_resolver.h', + 'linux/dpll.h', 'linux/dqblk_xfs.h', 'linux/dvb/audio.h', 'linux/dvb/ca.h', @@ -198,6 +200,7 @@ return { 'linux/erspan.h', 'linux/ethtool.h', 'linux/ethtool_netlink.h', + 'linux/eventfd.h', 'linux/eventpoll.h', 'linux/ext4.h', 'linux/f2fs.h', @@ -349,6 +352,7 @@ return { 'linux/loadpin.h', 'linux/loop.h', 'linux/lp.h', + 'linux/lsm.h', 'linux/lwtunnel.h', 'linux/magic.h', 'linux/major.h', @@ -376,6 +380,7 @@ return { 'linux/mpls.h', 'linux/mpls_iptunnel.h', 'linux/mptcp.h', + 'linux/mptcp_pm.h', 'linux/mqueue.h', 'linux/mroute.h', 'linux/mroute6.h', @@ -553,12 +558,15 @@ return { 'linux/nfsd/debug.h', 'linux/nfsd/export.h', 'linux/nfsd/stats.h', + 'linux/nfsd_netlink.h', 'linux/nilfs2_api.h', 'linux/nilfs2_ondisk.h', 'linux/nitro_enclaves.h', 'linux/nl80211-vnd-intel.h', 'linux/nl80211.h', + 'linux/npcm-video.h', 'linux/nsfs.h', + 'linux/nsm.h', 'linux/nubus.h', 'linux/nvme_ioctl.h', 'linux/nvram.h', @@ -599,6 +607,7 @@ return { 'linux/prctl.h', 'linux/psample.h', 'linux/psci.h', + 'linux/psp-dbc.h', 'linux/psp-sev.h', 'linux/ptp_clock.h', 'linux/ptrace.h', @@ -694,7 +703,6 @@ return { 'linux/tc_act/tc_gact.h', 'linux/tc_act/tc_gate.h', 'linux/tc_act/tc_ife.h', - 'linux/tc_act/tc_ipt.h', 'linux/tc_act/tc_mirred.h', 'linux/tc_act/tc_mpls.h', 'linux/tc_act/tc_nat.h', @@ -715,6 +723,7 @@ return { 'linux/tee.h', 'linux/termios.h', 'linux/thermal.h', + 'linux/thp7312.h', 'linux/time.h', 'linux/time_types.h', 'linux/timerfd.h', @@ -727,6 +736,7 @@ return { 'linux/tipc_sockets_diag.h', 'linux/tls.h', 'linux/toshiba.h', + 'linux/tps6594_pfsm.h', 'linux/tty.h', 'linux/tty_flags.h', 'linux/types.h', @@ -871,6 +881,7 @@ return { 'rdma/rvt-abi.h', 'rdma/siw-abi.h', 'rdma/vmw_pvrdma-abi.h', + 'regulator/regulator.h', 'scsi/cxlflash_ioctl.h', 'scsi/fc/fc_els.h', 'scsi/fc/fc_fs.h', @@ -893,6 +904,7 @@ return { 'sound/hdspm.h', 'sound/intel/avs/tokens.h', 'sound/sb16_csp.h', + 'sound/scarlett2.h', 'sound/sfnt_info.h', 'sound/skl-tplg-interface.h', 'sound/snd_ar_tokens.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 e373a645de1b2e57878dc17420dad3d0464694e6 Mon Sep 17 00:00:00 2001 +From 72b27c48f468c547dcd93beae9041417c05ef655 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 c994ff5b157c..ed8261560f2b 100644 +index 754e68ca8744..11bef290a69e 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -5850,12 +5850,10 @@ enum { +@@ -5970,12 +5970,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 c994ff5b157c..ed8261560f2b 100644 /* Current network namespace */ enum { -- -2.37.3 +2.44.0 diff --git a/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch @@ -1,4 +1,4 @@ -From 4d7aad2421c783cf57f359638197f0ad2a32a287 Mon Sep 17 00:00:00 2001 +From 069cbc8a25155771af775ee084ba3519ed5a9602 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Mon, 30 Aug 2021 19:26:32 -0700 Subject: [PATCH] Prevent zero-length array members in asound.h @@ -8,10 +8,10 @@ Subject: [PATCH] Prevent zero-length array members in asound.h 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h -index 0aa955aa8246..2e7ca9236c7a 100644 +index 628d46a0da92..23b0d301e83f 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h -@@ -550,22 +550,30 @@ struct __snd_pcm_sync_ptr { +@@ -557,22 +557,30 @@ struct __snd_pcm_sync_ptr { } c; }; @@ -48,7 +48,7 @@ index 0aa955aa8246..2e7ca9236c7a 100644 struct __snd_timespec64 tstamp; /* Timestamp */ snd_pcm_state_t suspended_state;/* RO: suspended stream state */ __u32 pad3; /* Needed for 64 bit alignment */ -@@ -573,16 +581,19 @@ struct __snd_pcm_mmap_status64 { +@@ -580,16 +588,19 @@ struct __snd_pcm_mmap_status64 { }; struct __snd_pcm_mmap_control64 { @@ -73,5 +73,5 @@ index 0aa955aa8246..2e7ca9236c7a 100644 __u32 flags; __u32 pad1; -- -2.37.3 +2.44.0 diff --git a/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch @@ -1,32 +0,0 @@ -From 3685e3c0cb5029b4e17eee6a53d2214190738c24 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 2 Dec 2021 14:49:08 -0800 -Subject: [PATCH] Make struct bpf_timer include a named member - -A struct without any named members is undefined behavior by C11 -6.7.2.1p8. - -Signed-off-by: Michael Forney <mforney@mforney.org> ---- - include/uapi/linux/bpf.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index ed8261560f2b..fb60bc7bb305 100644 ---- a/include/uapi/linux/bpf.h -+++ b/include/uapi/linux/bpf.h -@@ -6968,9 +6968,8 @@ struct bpf_spin_lock { - }; - - struct bpf_timer { -- __u64 :64; -- __u64 :64; --} __attribute__((aligned(8))); -+ __u64 reserved[2]; -+}; - - struct bpf_dynptr { - __u64 :64; --- -2.37.3 - diff --git a/pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/linux-headers/patch/0004-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256 @@ -1 +1 @@ -8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 linux-6.4.tar.xz +c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3 linux-6.8.tar.xz diff --git a/pkg/linux-headers/url b/pkg/linux-headers/url @@ -1 +1 @@ -url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz" +url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.tar.xz" diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver @@ -1 +1 @@ -6.4 r0 +6.8 r0