Update

1 files changed, 51 insertions, 276 deletions

diff --git a/linux-raveos/PKGBUILD b/linux-raveos/PKGBUILD
index 8d8c991..d15b6b9 100644
--- a/linux-raveos/PKGBUILD
+++ b/linux-raveos/PKGBUILD
@@ -1,26 +1,13 @@
-# Maintainer: Peter Jung ptr1337 <admin@ptr1337.dev>
-# Maintainer: Piotr Gorski <piotrgorski@cachyos.org>
-# Maintainer: Vasiliy Stelmachenok <ventureo@cachyos.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
+# Maintainer: RaveOS Project
+# Based on linux-cachyos by Peter Jung ptr1337 <admin@ptr1337.dev>
 
 ### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
 
 ### Selecting CachyOS config
 : "${_cachy_config:=yes}"
 
-### Selecting the CPU scheduler
-# ATTENTION - only one of the following values can be selected:
-# 'bore' - select 'Burst-Oriented Response Enhancer'
-# 'bmq' - select 'BMQ Scheduler'
-# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-# 'cachyos' - select 'CachyOS Default Scheduler (EEVDF)'
-# 'eevdf' - select 'EEVDF Scheduler'
-# 'rt' - select EEVDF, but includes a series of realtime patches
-# 'rt-bore' - select Burst-Oriented Response Enhancer, but includes a series of realtime patches
-: "${_cpusched:=cachyos}"
+### CPU scheduler - BORE (gaming/desktop optimized)
+: "${_cpusched:=bore}"
 
 ### Tweak kernel options prior to a build via nconfig
 : "${_makenconfig:=no}"
@@ -28,24 +15,13 @@
 ### Tweak kernel options prior to a build via xconfig
 : "${_makexconfig:=no}"
 
-# Compile ONLY used modules to VASTLYreduce the number of modules built
-# and the build time.
-#
-# To keep track of which modules are needed for your specific system/hardware,
-# give module_db script a try: https://aur.archlinux.org/packages/modprobed-db
-# This PKGBUILD read the database kept if it exists
-#
-# More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db
+# Compile ONLY used modules to VASTLY reduce the number of modules built
 : "${_localmodcfg:=no}"
 
 # Path to the list of used modules
 : "${_localmodcfg_path:="$HOME/.config/modprobed.db"}"
 
 # Use the current kernel's .config file
-# Enabling this option will use the .config of the RUNNING kernel rather than
-# the ARCH defaults. Useful when the package gets updated and you already went
-# through the trouble of customizing your config options.  NOT recommended when
-# a new kernel is released, but again, convenient for package bumps.
 : "${_use_current:=no}"
 
 ### Enable KBUILD_CFLAGS -O3
@@ -57,106 +33,39 @@
 ### Enable TCP_CONG_BBR3
 : "${_tcp_bbr3:=no}"
 
-### Running with a 1000HZ, 750Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
+### Running with 1000Hz tick rate (low latency desktop)
 : "${_HZ_ticks:=1000}"
 
-## Choose between periodic, idle or full
-### Full tickless can give higher performances in various cases but, depending on hardware, lower consistency.
+## Full tickless for best desktop performance
 : "${_tickrate:=full}"
 
-## Choose between full, lazy or dynamic
-# Full: Makes all non-critical kernel code preemptible to reduce latency
-# Lazy: Same as full but instead of preempting immediately it waits for signals from the scheduler
-#       in an attempt to boost throughput.
-#       In practice, this doesn't seem to perform well as both throughput and latency suffer
-#       compared to full.
+## Full preemption for lowest latency
 : "${_preempt:=full}"
 
-### Transparent Hugepages
-# ATTENTION - one of two predefined values should be selected!
-# 'always' - always enable THP
-# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
-# More infos here:
-# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
+### Transparent Hugepages - always (gaming/desktop memory performance)
 : "${_hugepage:=always}"
 
-# CPU compiler optimizations - Defaults to native if left empty
-# - "native" (use compiler autodetection)
-# - "zen4" (Use znver4 compiler optimizations)
-# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+# CPU compiler optimizations
 : "${_processor_opt:=}"
 
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
-# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
-# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "thin-dist: Similar to thin, but uses a distributed model rather than in-process: https://discourse.llvm.org/t/rfc-distributed-thinlto-build-for-kernel/85934"
-# "none: disable LTO
+# Clang LTO - thin (faster builds, good performance)
 : "${_use_llvm_lto:=thin}"
 
-# Use suffix -lto only when requested by the user
-# yes - enable -lto suffix
-# no - disable -lto suffix
-# https://github.com/CachyOS/linux-cachyos/issues/36
 : "${_use_lto_suffix:=no}"
-
-# Use suffix -gcc when requested by the user
-# Enabled by default to show the difference between LTO kernels and GCC kernels
 : "${_use_gcc_suffix:=yes}"
-
-# KCFI is a proposed forward-edge control-flow integrity scheme for
-# Clang, which is more suitable for kernel use than the existing CFI
-# scheme used by CONFIG_CFI_CLANG. kCFI doesn't require LTO, doesn't
-# alter function references to point to a jump table, and won't break
-# function address equality.
 : "${_use_kcfi:=no}"
-
-# Build the zfs module in to the kernel
-# WARNING: The ZFS module doesn't build with selected RT sched due to licensing issues.
-# If you use ZFS, refrain from building the RT kernel
 : "${_build_zfs:=no}"
-
-# Builds the open nvidia module and package it into a own base
-# This does replace the requirement of nvidia-open-dkms
-# Use this only if you have Turing+ GPU
 : "${_build_nvidia_open:=no}"
-
-# Builds the r8125 module and package it into its own package
-# Replaces requirement for r8125-dkms
 : "${_build_r8125:=no}"
-
-# Build a debug package with non-stripped vmlinux
 : "${_build_debug:=no}"
-
-# Enable AUTOFDO_CLANG for the first compilation to create a kernel, which can be used for profiling
-# Workflow:
-# https://cachyos.org/blog/2411-kernel-autofdo/
-# 1. Compile Kernel with _autofdo=yes and _build_debug=yes
-# 2. Boot the kernel in QEMU or on your system, see Workload
-# 3. Profile the kernel and convert the profile, see Generating the Profile for AutoFDO
-# 4. Put the profile into the sourcedir
-# 5. Run kernel build again with the _autofdo_profile_name path to profile specified
 : "${_autofdo:=no}"
-
-# Name for the AutoFDO profile
 : "${_autofdo_profile_name:=}"
-
-# Propeller should be applied, after the kernel is optimized with AutoFDO
-# Workflow:
-# 1. Proceed with above AutoFDO Optimization, but enable at the final compilation also _propeller
-# 2. Boot into the AutoFDO Kernel and profile it
-# 3. Convert the profile into the propeller profile, example:
-# create_llvm_prof --binary=/usr/src/debug/linux-cachyos-rc/vmlinux --profile=propeller.data --format=propeller --propeller_output_module_name --out=propeller_cc_profile.txt --propeller_symorder=propeller_ld_profile.txt
-# 4. Place the propeller_cc_profile.txt and propeller_ld_profile.txt into the srcdir
-# 5. Enable _propeller_prefix
 : "${_propeller:=no}"
-
-# Enable this after the profiles have been generated
 : "${_propeller_profiles:=no}"
 
 # ATTENTION: Do not modify after this line
 _is_lto_kernel() {
-    [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full"  || "$_use_llvm_lto" = "thin-dist" ]]
+    [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" || "$_use_llvm_lto" = "thin-dist" ]]
     return $?
 }
 
@@ -165,26 +74,18 @@ _is_ci_build() {
     return $?
 }
 
-if _is_lto_kernel && [ "$_use_lto_suffix" = "yes"  ]; then
-    _pkgsuffix=cachyos-lto
-elif ! _is_lto_kernel && [ "$_use_gcc_suffix" = "yes" ]; then
-    _pkgsuffix=cachyos-gcc
-else
-    _pkgsuffix=cachyos
-fi
+_pkgsuffix=cachyos
 
 pkgbase="linux-$_pkgsuffix"
 _major=7.1
 _minor=2
-#_minorc=$((_minor+1))
-#_rcver=rc8
-pkgver=${_major}.${_minor}
 _tagrel=3
-pkgrel=3
 _srcname=cachyos-${_major}.${_minor}-${_tagrel}
-pkgdesc='Linux EEVDF + LTO + AutoFDO + Propeller Cachy Sauce Kernel by CachyOS with other patches and improvements.'
+pkgver=7.1.2-3
+pkgrel=1
+pkgdesc='Linux BORE + NTSYNC + Memory Optimized RaveOS Kernel based on CachyOS'
 _kernver="$pkgver-$pkgrel"
-_kernuname="${pkgver}-${_pkgsuffix}"
+_kernuname="${_major}.${_minor}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
@@ -217,8 +118,7 @@ _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
 _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
 source=(
     "https://github.com/CachyOS/linux/releases/download/${_srcname}/${_srcname}.tar.gz"
-    "config"
-)
+    "config")
 
 # LLVM makedepends
 if _is_lto_kernel; then
@@ -232,23 +132,23 @@ if _is_lto_kernel; then
     )
 fi
 
-# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues.
 if [[ "$_cpusched" = "rt" || "$_cpusched" = "rt-bore" ]]; then
     unset _build_zfs
 fi
 
-# ZFS support
 if [ "$_build_zfs" = "yes" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=c681af76c5a6a15caada25eb13090e41218c7831")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=6330a45b06d20125de679aae5f63ba14082671ef")
 fi
 
-
 if [ "$_build_nvidia_open" = "yes" ]; then
-    source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz")
+    source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
+             "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
+             "${_patchsource}/misc/nvidia/0003-fix-dsc-correct-RC-parameter-tables-to-match-VESA-DS.patch"
+             "${_patchsource}/misc/nvidia/0004-fix-dsc-use-bits_per_component-for-flatnessDetThresh.patch"
+             "${_patchsource}/misc/nvidia/0005-fix-dp-add-Bigscreen-Beyond-VR-headset-to-WAR-databa.patch")
 fi
 
-# Use generated AutoFDO Profile
 if [ "$_autofdo" = "yes" ] && [ -n "$_autofdo_profile_name" ]; then
     if [ -e "$_autofdo_profile_name" ]; then
         source+=("$_autofdo_profile_name")
@@ -257,7 +157,6 @@ if [ "$_autofdo" = "yes" ] && [ -n "$_autofdo_profile_name" ]; then
     fi
 fi
 
-# Use generated Propeller Profile
 if [ "$_propeller" = "yes" ] && [ "$_propeller_profiles" = "yes" ]; then
     source+=(propeller_cc_profile.txt
              propeller_ld_profile.txt)
@@ -267,19 +166,18 @@ if [ "$_build_r8125" = "yes" ]; then
     source+=("git+https://github.com/aravance/r8125.git")
 fi
 
-## List of CachyOS schedulers
 case "$_cpusched" in
-    bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
+    bore|rt-bore|hardened)
         source+=("${_patchsource}/sched/0001-bore-cachy.patch");;&
-    bmq) ## Project C Scheduler
+    bmq)
         source+=("${_patchsource}/sched/0001-prjc-cachy.patch");;
-    hardened) ## Hardened Patches
+    hardened)
         source+=("${_patchsource}/misc/0001-hardened.patch");;
-    rt|rt-bore) ## RT patches
+    rt|rt-bore)
         source+=("${_patchsource}/misc/0001-rt-i915.patch");;
 esac
 
-export KBUILD_BUILD_HOST=cachyos
+export KBUILD_BUILD_HOST=raveos
 export KBUILD_BUILD_USER="$pkgbase"
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
@@ -312,7 +210,6 @@ prepare() {
     ### Select CPU optimization
     if [ -n "$_processor_opt" ]; then
         MARCH="${_processor_opt^^}"
-
         case "$MARCH" in
             GENERIC_V[1-4]) scripts/config -e GENERIC_CPU -d MZEN4 -d X86_NATIVE_CPU \
                 --set-val X86_64_VERSION "${MARCH//GENERIC_V}";;
@@ -387,7 +284,7 @@ prepare() {
     ### Select tick type
     case "$_tickrate" in
         periodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
-        idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE  -e NO_HZ -e NO_HZ_COMMON;;
+        idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
         full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
         *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
     esac
@@ -395,15 +292,12 @@ prepare() {
     echo "Selecting '$_tickrate' tick type..."
 
     ### Select preempt type
-
-    # We should not set up the PREEMPT for RT kernels
     if [[ "$_cpusched" != "rt" && "$_cpusched" != "rt-bore" ]]; then
         case "$_preempt" in
             full) scripts/config -e PREEMPT -d PREEMPT_LAZY;;
             lazy) scripts/config -d PREEMPT -e PREEMPT_LAZY;;
             *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
         esac
-
         echo "Selecting '$_preempt' preempt type..."
     fi
 
@@ -417,7 +311,6 @@ prepare() {
     ### CI-only stuff
     if _is_ci_build; then
         echo "Detected build inside CI"
-
         scripts/config \
             -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \
             -e CC_OPTIMIZE_FOR_SIZE \
@@ -439,7 +332,7 @@ prepare() {
             -e CONFIG_DEFAULT_FQ
     fi
 
-    ### Select THP
+    ### Select THP - always for gaming/desktop memory performance
     case "$_hugepage" in
         always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
         madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
@@ -448,33 +341,18 @@ prepare() {
 
     echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
 
-    # Enable Clang AutoFDO
-    # Add additonal check if Thin or Full LTO is enabled otherwise die
-    if [ "$_autofdo" = "yes" ]; then
-        scripts/config -e AUTOFDO_CLANG
-    fi
-
-    if [ "$_autofdo" = "yes" ] && [ -n "$_autofdo_profile_name" ]; then
-        echo "AutoFDO profile has been found..."
-        BUILD_FLAGS+=(CLANG_AUTOFDO_PROFILE="${srcdir}/${_autofdo_profile_name}")
-    fi
-
-    # Propeller Optimization
-    if [ "$_propeller" = "yes" ]; then
-        scripts/config -e PROPELLER_CLANG
-    fi
+    ### RaveOS specific: ZRAM builtin (not module) for early boot availability
+    echo "RaveOS: Setting ZRAM as builtin..."
+    scripts/config -e ZRAM
 
-    if [ "$_propeller" = "yes" ] && [ "$_propeller_profiles" = "yes" ]; then
-        echo "Propeller profile has been found..."
-        BUILD_FLAGS+=(CLANG_PROPELLER_PROFILE_PREFIX="${srcdir}/propeller")
-    fi
+    ### RaveOS specific: NTSYNC builtin for Proton/Wine (no modprobe needed)
+    echo "RaveOS: Setting NTSYNC as builtin for Proton/Wine..."
+    scripts/config -e NTSYNC
 
     ### Optionally use running kernel's config
-    # code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
     if [ "$_use_current" = "yes" ]; then
         if [[ -s /proc/config.gz ]]; then
             echo "Extracting config from /proc/config.gz..."
-            # modprobe configs
             zcat /proc/config.gz > ./.config
         else
             warning "Your kernel was not compiled with IKPROC!"
@@ -485,7 +363,6 @@ prepare() {
     fi
 
     ### Optionally load needed modules for the make localmodconfig
-    # See https://aur.archlinux.org/packages/modprobed-db
     if [ "$_localmodcfg" = "yes" ]; then
         if [ -e "$_localmodcfg_path" ]; then
             echo "Running Steven Rostedt's make localmodconfig now"
@@ -497,6 +374,7 @@ prepare() {
 
     ### Rewrite configuration
     echo "Rewrite configuration..."
+    make "${BUILD_FLAGS[@]}" olddefconfig
     make "${BUILD_FLAGS[@]}" prepare
     yes "" | make "${BUILD_FLAGS[@]}" config >/dev/null
     diff -u ../config .config || :
@@ -505,13 +383,9 @@ prepare() {
     make -s kernelrelease > version
     echo "Prepared $pkgbase version $(<version)"
 
-    ### Running make nconfig
     [ "$_makenconfig" = "yes" ] && make "${BUILD_FLAGS[@]}" nconfig
+    [ "$_makexconfig" = "yes" ] && make "${BUILD_FLAGS[@]}" xconfig
 
-    ### Running make xconfig
-    [ "$_makexconfig" = "yes" ] &&  make "${BUILD_FLAGS[@]}" xconfig
-
-    ### Save configuration for later reuse
     echo "Save configuration for later reuse..."
     local basedir="$(dirname "$(readlink "${srcdir}/config")")"
     cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
@@ -561,10 +435,8 @@ build() {
 
     if [ "$_build_zfs" = "yes" ]; then
         cd ${srcdir}/"zfs"
-
         local CONFIGURE_FLAGS=()
         [ "$_use_llvm_lto" != "none" ] && CONFIGURE_FLAGS+=("KERNEL_LLVM=1")
-
         ./autogen.sh
         sed -i "s|\$(uname -r)|${_kernuname}|g" configure
         ./configure "${CONFIGURE_FLAGS[@]}" --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
@@ -578,7 +450,6 @@ build() {
         cd "${srcdir}/r8125"
         make "${BUILD_FLAGS[@]}" KERNELDIR="$srcdir/$_srcname" modules
     fi
-
 }
 
 _package() {
@@ -589,49 +460,27 @@ _package() {
                 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig'
                 'scx-scheds: to use sched-ext schedulers')
     provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE V4L2LOOPBACK-MODULE NTSYNC-MODULE VHBA-MODULE ADIOS-MODULE)
-    # Replace LTO kernel with the default kernel
-    if _is_lto_kernel; then
-        provides+=(linux-cachyos-lto=$_kernver)
-        replaces=(linux-cachyos-lto)
-    fi
 
     cd "$_srcname"
-
     local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
 
     echo "Installing boot image..."
-    # systemd expects to find the kernel here to allow hibernation
-    # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
     install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
-
-    # Used by mkinitcpio to name the kernel
     echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
     echo "Installing modules..."
     ZSTD_CLEVEL=19 make "${BUILD_FLAGS[@]}" INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
-        DEPMOD=/doesnt/exist  modules_install  # Suppress depmod
+        DEPMOD=/doesnt/exist modules_install
 
-    # remove build links
     rm "$modulesdir"/build
 }
 
 _package-headers() {
     pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
-    depends=(binutils
-      glibc
-      libelf
-      libgcc
-      openssl
-      pahole
-      xxhash
-      zlib
-      zstd
-     "${pkgbase}")
+    depends=(binutils glibc libelf libgcc openssl pahole xxhash zlib zstd "${pkgbase}")
     provides=(LINUX-HEADERS)
 
     if _is_lto_kernel; then
-        provides+=(linux-cachyos-lto-headers=$_kernver)
-        replaces=(linux-cachyos-lto-headers)
         depends+=(clang llvm lld)
     fi
 
@@ -650,11 +499,8 @@ _package-headers() {
     install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
     cp -t "$builddir" -a scripts
     ln -srt "$builddir" "$builddir/scripts/gdb/vmlinux-gdb.py"
-
-    # required when STACK_VALIDATION is enabled
     install -Dt "$builddir/tools/objtool" tools/objtool/objtool
 
-    # required when DEBUG_INFO_BTF_MODULES is enabled
     if [ -f tools/bpf/resolve_btfids/resolve_btfids ]; then
         install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
     fi
@@ -663,37 +509,26 @@ _package-headers() {
     cp -t "$builddir" -a include
     cp -t "$builddir/arch/x86" -a arch/x86/include
     install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
-
     install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
     install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
-
-    # https://bugs.archlinux.org/task/13146
     install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
-
-    # https://bugs.archlinux.org/task/20402
     install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
     install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
     install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
-
-    # https://bugs.archlinux.org/task/71392
     install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
 
     echo "Installing KConfig files..."
     find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
 
-    # Install .rmeta files if they exist
     if compgen -G "rust/*.rmeta" 1>/dev/null; then
         install -Dt "$builddir/rust" -m644 rust/*.rmeta
     fi
-
-    # Install .so files if they exist
     if compgen -G "rust/*.so" 1>/dev/null; then
         install -Dt "$builddir/rust" rust/*.so
     fi
 
     echo "Installing unstripped VDSO..."
-    make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install \
-      link=  # Suppress build-id symlinks
+    make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install link=
 
     echo "Removing unneeded architectures..."
     local arch
@@ -716,14 +551,10 @@ _package-headers() {
     local file
     while read -rd '' file; do
         case "$(file -Sib "$file")" in
-            application/x-sharedlib\;*)      # Libraries (.so)
-                strip -v $STRIP_SHARED "$file" ;;
-            application/x-archive\;*)        # Libraries (.a)
-                strip -v $STRIP_STATIC "$file" ;;
-            application/x-executable\;*)     # Binaries
-                strip -v $STRIP_BINARIES "$file" ;;
-            application/x-pie-executable\;*) # Relocatable binaries
-                strip -v $STRIP_SHARED "$file" ;;
+            application/x-sharedlib\;*)      strip -v $STRIP_SHARED "$file" ;;
+            application/x-archive\;*)        strip -v $STRIP_STATIC "$file" ;;
+            application/x-executable\;*)     strip -v $STRIP_BINARIES "$file" ;;
+            application/x-pie-executable\;*) strip -v $STRIP_SHARED "$file" ;;
         esac
     done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
 
@@ -744,63 +575,6 @@ _package-dbg(){
     install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
 }
 
-_package-zfs(){
-    pkgdesc="zfs module for the $pkgdesc kernel"
-    depends=('pahole' "${pkgbase}=${_kernver}")
-    provides=('ZFS-MODULE')
-    license=('CDDL')
-
-    cd "$_srcname"
-    local modulesdir="$pkgdir/usr/lib/modules/$(<version)/extramodules"
-
-    cd "${srcdir}/zfs"
-    install -dm755 "${modulesdir}"
-    install -m644 module/*.ko "${modulesdir}"
-
-    _sign_modules "${modulesdir}"
-    find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
-    #  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
-}
-
-_package-nvidia-open(){
-    pkgdesc="nvidia open modules of ${_nv_ver} driver for the ${pkgbase} kernel"
-    depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
-    provides=('NVIDIA-MODULE')
-    conflicts=("$pkgbase-nvidia")
-    license=('MIT AND GPL-2.0-only')
-
-    cd "$_srcname"
-    local modulesdir="$pkgdir/usr/lib/modules/$(<version)/extramodules"
-
-    cd "${srcdir}/${_nv_open_pkg}"
-    install -dm755 "${modulesdir}"
-    install -m644 kernel-open/*.ko "${modulesdir}"
-    install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
-
-    _sign_modules "${modulesdir}"
-    find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
-}
-
-_package-r8125() {
-    pkgdesc="r8125 modules for the $pkgbase kernel"
-    depends=("$pkgbase=$_kernver")
-    license=('GPL-2.0-only')
-
-    cd "$_srcname"
-    local modulesdir="$pkgdir/usr/lib/modules/$(<version)/extramodules"
-
-    cd "${srcdir}/r8125"
-    install -dm755 "${modulesdir}"
-    install -m644 src/*.ko "${modulesdir}"
-
-    _sign_modules "${modulesdir}"
-    find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
-
-    # Blacklist r8169 so that r8125 is used instead
-    install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "install r8169 /usr/bin/modprobe r8125 || /usr/bin/modprobe --ignore-install r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-}
-
 pkgname=("$pkgbase")
 [ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
@@ -814,7 +588,8 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-b2sums=('SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP')
+b2sums=()
+for _i in "${source[@]}"; do
+    b2sums+=('SKIP')
+done
+