PDS Kernel Configuration

2023-01-03 07:13:32 -05:00
27 changed files with 953 additions and 3534 deletions
--- a/.github/workflows/build-current-kernel-arch.yml
+++ b/.github/workflows/build-current-kernel-arch.yml
@@ -10,8 +10,6 @@ env:
  _processor_opt: "generic"
  PKGDEST: "/tmp/linux-tkg"
  _debugdisable: "true"
-  _kernel_work_folder: "/tmp"
-  _kernel_source_folder: "/tmp"
  # _modprobeddb: "true"
  # _modprobeddb_db_path: ${{ github.workspace }}/modprobed.db

--- a/25
+++ b/25
@@ -48,6 +48,8 @@ fi

 source "$_where"/BIG_UGLY_FROGMINER

+_srcpath="linux-src-git"
+
 if [ -n "$_custom_pkgbase" ]; then
  pkgbase="${_custom_pkgbase}"
 else
@@ -79,12 +81,10 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 prepare() {
  rm -rf $pkgdir # Nuke the entire pkg folder so it'll get regenerated clean on next build

-  _define_kernel_abs_paths
-  if [ -e "${srcdir}/customization.cfg" ]; then
-    msg2 "Nuking remnant customization.cfg symlink" && rm -rf "${srcdir}/customization.cfg"
-  fi
-  ln -s "${_where}/customization.cfg" "${srcdir}"
-  ln -s "${_kernel_work_folder_abs}" "${srcdir}"
+  ln -s "${_where}/customization.cfg" "${srcdir}" # workaround
+  ln -s "${_where}/linux-src-git" "${srcdir}" # workaround, this doesn't respect tmpfs choice
+
+  cd "${srcdir}/${_srcpath}"

  source "${_where}/current_env"

@@ -92,7 +92,7 @@ prepare() {
 }

 build() {
-  cd "$_kernel_work_folder_abs"
+  cd "${srcdir}/${_srcpath}"

  # Use custom compiler paths if defined
  if [ "$_compiler_name" = "-llvm" ] && [ -n "${CUSTOM_LLVM_PATH}" ]; then
@@ -143,8 +143,7 @@ hackbase() {
  fi
  replaces=(virtualbox-guest-modules-arch wireguard-arch)

-  _define_kernel_abs_paths
-  cd "$_kernel_work_folder_abs"
+  cd "${srcdir}/${_srcpath}"

  # get kernel version
  local _kernver="$(<version)"
@@ -174,9 +173,9 @@ hackbase() {
  install -Dm644 "${srcdir}"/customization-full.cfg "${pkgdir}/usr/share/doc/${pkgbase}/customization.cfg"

  # workaround for missing header with winesync
-  if [ -e "${_kernel_work_folder_abs}/include/uapi/linux/winesync.h" ]; then
+  if [ -e "${srcdir}/${_srcpath}/include/uapi/linux/winesync.h" ]; then
    msg2 "Workaround missing winesync header"
-    install -Dm644 "${_kernel_work_folder_abs}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h"
+    install -Dm644 "${srcdir}/${_srcpath}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h"
  fi

  # load winesync module at boot
@@ -203,9 +202,7 @@ hackheaders() {
    ;;
  esac

-  _define_kernel_abs_paths
-  cd "$_kernel_work_folder_abs"
-
+  cd "${srcdir}/${_srcpath}"
  local builddir="${pkgdir}/usr/lib/modules/$(<version)/build"

  msg2 "Installing build files..."
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ This repository provides scripts to automatically download, patch and compile th
 - **Non-pacman distros support can be considered experimental. You're invited to report issues you might encounter with it.**
 - **If your distro isn't using systemd, please set _configfile="running-kernel" in customization.cfg or you might end up with a non-bootable kernel**

- Keep in mind building recent linux kernels with GCC will require ~20-25GB of disk space. Using llvm/clang, LTO, ccache and/or enabling more drivers in the defconfig will push that requirement higher, so make sure you have enough free space on the volume you're using to build.
 - In `intel_pstate` driver, frequency scaling aggressiveness has been changed with kernel 5.5 which results in stutters and poor performance in low/medium load scenarios (for higher power savings). As a workaround for our gaming needs, we are setting it to passive mode to make use of the `acpi_cpufreq` governor passthrough, keeping full support for turbo frequencies. It's combined with our aggressive ondemand governor by default for good performance on most CPUs while keeping frequency scaling for power savings. In a typical low/medium load scenario (Core i7 9700k, playing Mario Galaxy on Dolphin emulator) intel_pstate in performance mode gives a stuttery 45-50 fps experience, while passive mode + aggressive ondemand offers a locked 60 fps.
 - Nvidia's proprietary drivers might need to be patched if they don't support your chosen kernel OOTB: [Frogging-Family nvidia-all](https://github.com/Frogging-Family/nvidia-all) can do that automatically for you.
 - Note regarding kernels older than 5.9 on Arch Linux: since the switch to `zstd` compressed `initramfs` by default, you will face an `invalid magic at start of compress` error by default. You can workaround the issue by editing `/etc/mkinitcpio.conf` to uncomment the `COMPRESSION="lz4"` (for example, since that's the best option after zstd) line and regenerating `initramfs` for all kernels with `sudo mkinitpcio -P`
@@ -20,10 +19,8 @@ This repository provides scripts to automatically download, patch and compile th
 Alternative schedulers are available to you in linux-tkg:
 - Project C / PDS & BMQ by Alfred Chen: [blog](http://cchalpha.blogspot.com/ ), [code repository](https://gitlab.com/alfredchen/projectc)
 - MuQSS by Con Kolivas : [blog](http://ck-hack.blogspot.com/), [code repository](https://github.com/ckolivas/linux)
- CacULE by Hamad Marri - CFS based : [code repository](https://github.com/hamadmarri/cacule-cpu-scheduler)
- Task Type (TT) by Hamad Marri - CFS based : [code repository](https://github.com/hamadmarri/TT-CPU-Scheduler)
- BORE (Burst-Oriented Response Enhancer) by Masahito Suzuki - CFS based : [code repository](https://github.com/firelzrd/bore-scheduler)
- Undead PDS : TkG's port of the pre-Project C "PDS-mq" scheduler by Alfred Chen. While PDS-mq got dropped with kernel 5.1 in favor of its BMQ evolution/rework, it wasn't on par with PDS-mq in gaming. "U" PDS still performed better in some cases than other schedulers, so it's been kept undead for a while.
+- CacULE by Hamad Marri: [code repository](https://github.com/hamadmarri/cacule-cpu-scheduler)
+- Undead PDS: TkG's port of the pre-Project C "PDS-mq" scheduler by Alfred Chen. While PDS-mq got dropped with kernel 5.1 in favor of its BMQ evolution/rework, it wasn't on par with PDS-mq in gaming. "U" PDS still performs better in some cases than other schedulers, so it's been kept undead.

 These alternative schedulers can offer a better performance/latency ratio for gaming and desktop use. The availability of each scheduler depends on the chosen Kernel version: the script will display what's available on a per-version basis.
 #### Default tweaks
@@ -122,6 +119,17 @@ cd path/to/linux-tkg
 ```
 The script will use a slightly modified Arch config from the `linux-tkg-config` folder, it can be changed through the `_configfile` variable in `customization.cfg`.

+#### Void Linux
+```shell
+git clone -b tkg https://github.com/Hyper-KVM/void-packages/
+cd void-packages
+./xbps-src binary-bootstrap
+# Optional: edit customization.cfg located in srcpkgs/linux-tkg/files
+# Optional: add custom userpatches with the ".mypatch" extension to srcpkgs/linux-tkg/files/mypatches
+./xbps-src pkg -j$(nproc) linux-tkg
+```
+If you have to restart the build for any reason, run `./xbps-src clean linux-tkg` first.
+
 #### Generic install
 The interactive `install.sh` script can be used to perform a "Generic" install by choosing `Generic` when prompted. It git clones the kernel tree in the `linux-src-git` folder, patches the code and edits a `.config` file in it. The commands to do are the following:
 ```shell
--- a/customization.cfg
+++ b/customization.cfg
@@ -1,6 +1,6 @@
 # linux-TkG config file

-# Linux distribution you are using, options are "Arch", "Ubuntu", "Debian", "Fedora", "Suse", "Gentoo", "Generic".
+# Linux distribution you are using, options are "Arch", "Void", "Ubuntu", "Debian", "Fedora", "Suse", "Gentoo", "Generic".
 # It is automatically set to "Arch" when using PKGBUILD.
 # If left empty, the script will prompt
 _distro="Arch"
@@ -23,20 +23,6 @@ _NUKR="true"
 # Git mirror to use to get the kernel sources, possible values are "kernel.org", "googlesource.com", "github.com" and "torvalds"
 _git_mirror="kernel.org"

-# Root folder where to checkout the kernel sources (linux-src-git subdir) and build
-# Note: - Leave empty to use PKGBUILD's dir
-#       - Start with a '/' for an absolute path in which `linux-tkg/linux-src-git/` will be created
-#       - This setting can be used to set the work/build folder to a tmpfs folder
-#         - Requires >= 32GB ram when building a full kernel, should work with less ram with modprobed-db
-_kernel_work_folder=""
-
-# Permanent root folder where to keep the git clone (linux-kernel.git subdir) and fetch new blobs
-# Note: - Leave empty to use PKGBUILD's dir
-#       - Start with a '/' for an absolute path in which `linux-tkg/linux-kernel.git/` will be created
-#       - If your internet is faster than your storage, it may be wise to put this folder
-#         in a tmpfs location (although it will reclone after each restart / tmpfs folder cleanup)
-_kernel_source_folder=""
-
 # Custom compiler root dirs - Leave empty to use system compilers
 # Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0"
 CUSTOM_GCC_PATH=""
@@ -68,6 +54,17 @@ _diffconfig="false"
 # Set to the file name where the generated config fragment should be written to. Only used if _diffconfig is active.
 _diffconfig_name=""

+# [install.sh specific] Use tmpfs as a work directory, recommended when RAM >= 32GB to reduce HDD/SSD usage. For more information, see https://wiki.archlinux.org/title/Tmpfs
+_use_tmpfs="false"
+
+# Always make a fresh clone of the source in tmpfs to speed up compilation times
+# ! This will take ~20GB of RAM by itself, so don't use on <32GB RAM systems !
+_source_in_tmpfs="false"
+
+# [install.sh specific] tmpfs folder path, only used when _use_tmpfs="true".
+#                       Creates a linux-tkg work folder within that pathmake sure to have nothing important in "$_tmpfs_path/linux-tkg"
+_tmpfs_path="/tmp"
+
 # [install.sh: Generic and Gentoo specific] Dracut options when generating initramfs
 _dracut_options="--lz4"

@@ -96,7 +93,7 @@ _STRIP="true"

 # LEAVE AN EMPTY VALUE TO BE PROMPTED ABOUT FOLLOWING OPTIONS AT BUILD TIME

-# CPU scheduler - Options are "upds" (TkG's Undead PDS), "pds", "bmq", "muqss", "cacule", "tt", "bore" or "cfs" (kernel's default)
+# CPU scheduler - Options are "upds" (TkG's Undead PDS), "pds", "bmq", "muqss", "cacule" or "cfs" (kernel's default)
 _cpusched="pds"

 # Compiler to use - Options are "gcc" or "llvm".
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ _install_dependencies() {

 if [ "$1" != "install" ] && [ "$1" != "config" ] && [ "$1" != "uninstall-help" ]; then
  msg2 "Argument not recognised, options are:
-        - config : interactive script that shallow clones the linux 5.x.y git tree into the folder \$_kernel_work_folder, then applies extra patches and prepares the .config file
+        - config : interactive script that shallow clones the linux 5.x.y git tree into the folder linux-src-git, then applies extra patches and prepares the .config file
                   by copying the one from the currently running linux system and updates it.
        - install : does the config step, proceeds to compile, then prompts to install
                    - 'DEB' distros: it creates .deb packages that will be installed then stored in the DEBS folder.
@@ -136,9 +136,24 @@ if [ "$1" = "install" ] || [ "$1" = "config" ]; then
    _distro=""
  fi

+  # cd into the linux-src folder is important before calling _tkg_srcprep
+  cd "$_where/linux-src-git"
  _tkg_srcprep

-  _build_dir="$_kernel_work_folder_abs/.."
+  _build_dir="$_where"
+  if [ "$_use_tmpfs" = "true" ]; then
+    if [ -d "$_tmpfs_path/linux-tkg" ]; then
+      msg2 "Nuking linux-tkg tmpfs folder $_tmpfs_path/linux-tkg"
+      rm -rf "$_tmpfs_path/linux-tkg"
+    fi
+    mkdir "$_tmpfs_path/linux-tkg"
+    cp -r "$_where/linux-src-git" "$_tmpfs_path/linux-tkg/linux-src-git"
+
+    # cd into the linux-src folder is important before calling _tkg_srcprep
+    _build_dir="$_tmpfs_path/linux-tkg"
+    cd "$_tmpfs_path/linux-tkg/linux-src-git"
+  fi
+

  # Uppercase characters are not allowed in source package name for debian based distros
  if [[ "$_distro" =~ ^(Debian|Ubuntu)$ && "$_cpusched" = "MuQSS" ]]; then
@@ -206,8 +221,6 @@ if [ "$1" = "install" ]; then
    #_runtime=$( time ( schedtool -B -n 1 -e ionice -n 1 "$@" 2>&1 ) 3>&1 1>&2 2>&3 ) || _runtime=$( time ( "$@" 2>&1 ) 3>&1 1>&2 2>&3 ) - Bash 5.2 is broken https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018727
  #}

-  cd "$_kernel_work_folder_abs"
-
  if [[ "$_distro" =~ ^(Ubuntu|Debian)$ ]]; then

    msg2 "Building kernel DEB packages"
@@ -249,7 +262,10 @@ if [ "$1" = "install" ]; then
      _extra_ver_str="_${_kernel_flavor}"
    fi

-    _fedora_work_dir="$_kernel_work_folder_abs/linux-tkg-rpmbuild"
+    _fedora_work_dir="${HOME}/.cache/linux-tkg-rpmbuild"
+    if [ "$_use_tmpfs" = "true" ]; then
+      _fedora_work_dir="$_tmpfs_path/linux-tkg/linux-tkg-rpmbuild"
+    fi

    msg2 "Building kernel RPM packages"
    RPMOPTS="--define '_topdir ${_fedora_work_dir}'" make ${llvm_opt} -j ${_thread_num} rpm-pkg EXTRAVERSION="${_extra_ver_str}"
@@ -416,7 +432,7 @@ if [ "$1" = "uninstall-help" ]; then
    msg2 "Note: linux-libc-dev packages are no longer created and installed, you can safely remove any remnants."
  elif [ "$_distro" = "Fedora" ]; then
    msg2 "List of installed custom tkg kernels: "
-    dnf list --installed | grep -i "tkg"
+    dnf list --installed kernel*
    msg2 "To uninstall a version, you should remove the kernel, kernel-headers and kernel-devel associated to it (if installed), with: "
    msg2 "      sudo dnf remove --noautoremove kernel-VERSION kernel-devel-VERSION kernel-headers-VERSION"
    msg2 "       where VERSION is displayed in the second column"
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -283,6 +283,7 @@ _set_cpu_scheduler() {
    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
  elif [ "$_kver" = "601" ]; then
    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
+    _projectc_unoff=1
  elif [ "$_kver" = "602" ]; then
    _avail_cpu_scheds=("cfs" "tt" "bore")
  else
@@ -381,31 +382,8 @@ _set_compiler(){
  echo -e "_compiler_name='$_compiler_name'\nllvm_opt='$llvm_opt'" >> "$_where"/BIG_UGLY_FROGMINER
 }

-_define_kernel_abs_paths() {

-  source "$_where"/BIG_UGLY_FROGMINER
-
-  if [ -z "$_kernel_work_folder_abs" ]; then
-    _kernel_work_folder_abs="$_where/$_kernel_work_folder/linux-src-git"
-    if [[ "$_kernel_work_folder" == /* ]]; then
-      _kernel_work_folder_abs="$_kernel_work_folder/linux-tkg/linux-src-git"
-    fi
-    echo -e "_kernel_work_folder_abs=\"$_kernel_work_folder_abs\"" >> "$_where"/BIG_UGLY_FROGMINER
-  fi
-
-  if [ -z "$_kernel_source_folder_abs" ]; then
-    _kernel_source_folder_abs="$_where/$_kernel_source_folder/linux-kernel.git"
-    if [[ "$_kernel_source_folder" == /* ]]; then
-      _kernel_source_folder_abs="$_kernel_source_folder/linux-tkg/linux-kernel.git"
-    fi
-    echo -e "_kernel_source_folder_abs=\"$_kernel_source_folder_abs\"" >> "$_where"/BIG_UGLY_FROGMINER
-  fi
-}
-
-
-_setup_kernel_work_folder() {
-
-  _define_kernel_abs_paths
+_linux_git_branch_checkout() {

  if [ -z "$_kernel_git_tag" ]; then
    warning "internal error: kernel version should be chosen before cloning kernel sources"
@@ -414,44 +392,85 @@ _setup_kernel_work_folder() {

  cd "$_where"

-  if ! [ -d "$_kernel_source_folder_abs" ]; then
+  if ! [ -d linux-src-git ] || ( [ "$_source_in_tmpfs" = "true" ] && ! [ -d /tmp/linux-src-git ] ); then
    msg2 "First initialization of the linux source code git folder"
-    mkdir -p "$_kernel_source_folder_abs"
-    cd "$_kernel_source_folder_abs"
-    git init --bare
+    if [ "$_source_in_tmpfs" = "true" ]; then
+      rm -rf "${_where}/linux-src-git"
+      mkdir "/tmp/linux-src-git"
+      ln -s "/tmp/linux-src-git" "${_where}"
+    else
+      mkdir linux-src-git
+    fi
+    cd linux-src-git
+    git init
+
+    for remote in "${!_kernel_git_remotes[@]}"; do
+      git remote add "$remote" "${_kernel_git_remotes[$remote]}"
+    done
+  else
+    if [ "$_source_in_tmpfs" = "true" ]; then
+      rm -rf "${_where}/linux-src-git"
+      ln -s "/tmp/linux-src-git" "${_where}"
    fi

-  cd "$_kernel_source_folder_abs"
+    cd linux-src-git
+
+    # Remove "origin" remote if present
+    if git remote -v | grep -w "origin" ; then
+      git remote rm origin
+    fi

-  # Add remotes if needed
    for remote in "${!_kernel_git_remotes[@]}"; do
      if ! git remote -v | grep -w "$remote" ; then
        git remote add "$remote" "${_kernel_git_remotes[$remote]}"
      fi
    done

-  msg2 "Fetching tag: $_kernel_git_tag from mirror $_git_mirror"
-  git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+    msg2 "Current branch: $(git branch | grep "\*")"
+    msg2 "Reseting files to their original state"

-  msg2 "Checking out tag: $_kernel_git_tag"
-  msg2 "   in the work folder: $_kernel_work_folder_abs"
-
-  # The space ' ' in grep -w "$_kernel_work_folder_abs " is important
-  # to not match an existing folder with a longer name with the same prefix name
-  if [ -d "$_kernel_work_folder_abs" ] && \
-     ( git worktree list | grep -w "$_kernel_work_folder_abs " ) && \
-     ( cd "$_kernel_work_folder_abs" && git status > /dev/null 2>&1 ); then
-    # Worktree folder exists and is a valid worktree
-    cd "$_kernel_work_folder_abs"
-    git reset --hard
-    git clean -ffdx
-    git checkout "$_kernel_git_tag"
-  else
-    # In all other cases, just force create the work tree
-    rm -rf "$_kernel_work_folder_abs"
-    git worktree add -f "$_kernel_work_folder_abs" "$_kernel_git_tag"
+    git reset --hard HEAD
+    git clean -f -d -x
  fi

+  if [[ "$_sub" = rc* ]]; then
+    msg2 "Switching to master branch for RC Kernel"
+
+    if ! git branch --list | grep "master-${_git_mirror}" ; then
+      msg2 "master branch doesn't locally exist, shallow cloning..."
+      git remote set-branches --add kernel.org master
+      git remote set-branches --add googlesource.com master
+      git remote set-branches --add torvalds master
+      git fetch --depth=1 $_git_mirror master
+      git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+      git checkout -b master-${_git_mirror} ${_git_mirror}/master
+    else
+      msg2 "master branch exists locally, updating..."
+      git checkout master-${_git_mirror}
+      git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+      git reset --hard ${_git_mirror}/master
+    fi
+    msg2 "Checking out latest RC tag: $_kernel_git_tag"
+    git checkout "$_kernel_git_tag"
+  else
+    msg2 "Switching to linux-${_basekernel}.y"
+    if ! git branch --list | grep -w "linux-${_basekernel}-${_git_mirror}" ; then
+      msg2 "${_basekernel}.y branch doesn't locally exist, shallow cloning..."
+      git remote set-branches --add kernel.org linux-${_basekernel}.y
+      git remote set-branches --add googlesource.com linux-${_basekernel}.y
+      git remote set-branches --add torvalds linux-${_basekernel}.y
+      git fetch --depth=1 $_git_mirror linux-${_basekernel}.y
+      git fetch --depth=1 $_git_mirror tag "$_kernel_git_tag"
+      git checkout -b linux-${_basekernel}-${_git_mirror} ${_git_mirror}/linux-${_basekernel}.y
+    else
+      msg2 "${_basekernel}.y branch exists locally, updating..."
+      git checkout linux-${_basekernel}-${_git_mirror}
+      git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+      git reset --hard ${_git_mirror}/linux-${_basekernel}.y
+    fi
+    msg2 "Checking out latest release: $_kernel_git_tag"
+    git checkout "$_kernel_git_tag"
+  fi
 }


@@ -469,23 +488,6 @@ _tkg_initscript() {
    exit 1
  fi

-  typeset -Ag _deprecated_config_var_set
-
-  # Check if user is defining deprecated config vars
-  _deprecated_config_var_set=(
-    ["_use_tmpfs"]=`[ -n "$_use_tmpfs" ]; echo $?`
-    ["_source_in_tmpfs"]=`[ -n "$_source_in_tmpfs" ]; echo $?`
-    ["_tmpfs_path"]=`[ -n "$_tmpfs_path" ]; echo $?`
-  )
-
-  for _deprectated_config_var in "${!_deprecated_config_var_set[@]}"; do
-    if [ "${_deprecated_config_var_set[$_deprectated_config_var]}" == "0" ]; then
-      warning "The deprecated config var $_deprectated_config_var has been set"
-      warning "Please check the latest customization.cfg file to see what replaces it"
-      exit 1
-    fi
-  done
-
  # Default to Arch
  if [ -z "$_distro" ] || [ "$_ispkgbuild" = "true" ]; then
    msg2 "Defaulting to Archlinux target\n"
@@ -493,7 +495,11 @@ _tkg_initscript() {
  fi

  # create build dir early
+  if [ "$_distro" = "Void" ]; then
+    _path="${XBPS_BUILDDIR}/${wrksrc}"
+  else
    _path="${_where}"
+  fi

  # Clean the logs folder
  [ -e "${_where}/logs" ] && rm -rf "${_where}/logs"
@@ -505,8 +511,13 @@ _tkg_initscript() {
  # Select CPU scheduler
  _set_cpu_scheduler

+  if [ "$_distro" != "Void" ]; then
    cp "$_where"/linux-tkg-patches/${_basekernel}/* "$_where" # copy patches inside the PKGBUILD's dir to preserve makepkg sourcing and md5sum checking
    cp "$_where"/linux-tkg-config/${_basekernel}/* "$_where" # copy config files and hooks inside the PKGBUILD's dir to preserve makepkg sourcing and md5sum checking
+  else
+    cp "$_where"/linux-tkg-patches/${_basekernel}/* "$_path"
+    cp "$_where"/linux-tkg-config/${_basekernel}/* "$_path"
+  fi

  # Set compiler
  _set_compiler
@@ -515,7 +526,7 @@ _tkg_initscript() {
    echo -e "_custom_pkgbase=\"$_custom_pkgbase\"" >> "$_where"/BIG_UGLY_FROGMINER
  fi

-  _setup_kernel_work_folder
+  _linux_git_branch_checkout
 }

 user_patcher() {
@@ -582,16 +593,12 @@ _tkg_patcher() {
    patch -Np1 -i "$tkgpatch" >> "$_where"/logs/prepare.log.txt || error "An error was encountered applying patches. It was logged to the prepare.log.txt file."
    echo -e "\n" >> "$_where"/logs/prepare.log.txt
  else
-    msg2 "Skipping patch ${tkgpatch##*/}...\n         (unavailable for this kernel version)"
+    msg2 "Skipping patch %s...\n         (unavailable for this kernel version)" "${tkgpatch##*/}" #"
  fi
 }

 _tkg_srcprep() {

-  _define_kernel_abs_paths
-
-  cd "$_kernel_work_folder_abs"
-
  msg2 "Setting version..."
  scripts/setlocalversion --save-scmversion

@@ -600,6 +607,13 @@ _tkg_srcprep() {
    echo -e "Version tail set to \"-$pkgrel-tkg-${_cpusched}${_compiler_name}\"\n" > "$_where"/logs/prepare.log.txt
    echo "" > localversion.20-pkgname
  fi
+  if [ "${_distro}" = "Void" ]; then
+	  pkgver="${version}"
+  fi
+  if [ "${_distro}" = "Arch" ] || [ "${_distro}" = "Void" ]; then
+    tkgpatch="$srcdir/patch-${pkgver}"
+    _msg="Patching from $_basekernel to $pkgver" && _tkg_patcher
+  fi

  # Hardened Patches
  if [ "${_configfile}" = "config_hardened.x86_64" ] && [ "${_cpusched}" = "cfs" ]; then
@@ -615,6 +629,9 @@ _tkg_srcprep() {
  # graysky's cpu opts - https://github.com/graysky2/kernel_compiler_patch

  _patch_location="$srcdir"
+  if [ "${_distro}" = "Void" ]; then
+    _patch_location="${wrksrc}"
+  fi

  if [ "$_kver" = "504" ]; then
    _patch_name="more-uarches-for-kernel-4.19-5.4"
@@ -680,8 +697,10 @@ _tkg_srcprep() {
    _msg="Applying glitched base non-rt additions patch" && _tkg_patcher
  fi

+  if [[ "$_distro" =~ ^(Fedora|Suse)$ ]]; then
    tkgpatch="$srcdir/0013-fedora-rpm.patch"
    _msg="RPM: fixing spec generator" && _tkg_patcher
+  fi

  if [ -z $_misc_adds ]; then
    plain "Enable misc additions ? They may contain temporary fixes pending upstream, or some other changes that can break on non-Arch distros."
@@ -721,8 +740,6 @@ _tkg_srcprep() {
    rev=1
  elif [ "$_kver" = "518" ]; then
    rev=2
-  elif [ "$_kver" = "601" ]; then
-    rev=1
  else
    rev=0
  fi
@@ -784,6 +801,16 @@ _tkg_srcprep() {
    tkgpatch="$srcdir/0009-glitched-bmq.patch" && _tkg_patcher
  elif [ "${_cpusched}" = "cacule" ]; then
    _msg="Applying cacule patch"
+    if [ "${_distro}" = "Void" ]; then
+      if [[ $_kver -lt 515 ]]; then
+        wget -P "$wrksrc" "https://raw.githubusercontent.com/hamadmarri/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/cacule-${_basekernel}.patch"
+      elif [[ $_kver = 515 ]]; then
+        wget -P "$wrksrc" "https://raw.githubusercontent.com/CachyOS/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/cacule-${_basekernel}.patch"
+      else
+        wget -P "$wrksrc" "https://raw.githubusercontent.com/CachyOS/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/0001-cacULE-${_basekernel}.patch"
+      fi
+      tkgpatch="$wrksrc/cacule-${_basekernel}.patch" && _tkg_patcher
+    else
      if [[ $_kver -lt 515 ]]; then
        wget -P "$srcdir" "https://raw.githubusercontent.com/hamadmarri/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/cacule-${_basekernel}.patch"
      elif [[ $_kver = 515 ]]; then
@@ -793,27 +820,40 @@ _tkg_srcprep() {
      fi
      tkgpatch="$srcdir/cacule-${_basekernel}.patch" && _tkg_patcher
      tkgpatch="$srcdir/0001-cacULE-${_basekernel}.patch" && _tkg_patcher
+    fi
  elif [ "${_cpusched}" = "tt" ]; then
    _msg="Applying TT patch"
+    if [ "${_distro}" = "Void" ]; then
+      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$wrksrc"/tt.patch
+      tkgpatch="$wrksrc/tt.patch" && _tkg_patcher
+    else
      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$srcdir"/tt.patch
      tkgpatch="$srcdir/tt.patch" && _tkg_patcher
+    fi
    if [ "$_tt_high_hz" = "true" ] && [ $_kver = 515 ]; then
      _msg="Applying TT High HZ patch"
+      if [ "${_distro}" = "Void" ]; then
+        curl "https://raw.githubusercontent.com/hamadmarri/TT-CPU-Scheduler/master/patches/${_basekernel}/high-hz.patch" > "$wrksrc"/tt_high_hz.patch
+        tkgpatch="$wrksrc/tt_high_hz.patch" && _tkg_patcher
+      else
        curl "https://raw.githubusercontent.com/hamadmarri/TT-CPU-Scheduler/master/patches/${_basekernel}/high-hz.patch" > "$srcdir"/tt_high_hz.patch
        tkgpatch="$srcdir/tt_high_hz.patch" && _tkg_patcher
      fi
+    fi
  elif [ "${_cpusched}" = "bore" ]; then
    _msg="Applying BORE patch"
+    if [ "${_distro}" = "Void" ]; then
+      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$wrksrc"/0001-bore.patch
+      tkgpatch="$wrksrc/0001-bore.patch" && _tkg_patcher
+    else
      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$srcdir"/0001-bore.patch
      tkgpatch="$srcdir/0001-bore.patch" && _tkg_patcher
-  elif [ "${_cpusched}" = "cfs" ]; then
-    _msg="Applying Glitched CFS additions patch"
-    tkgpatch="$srcdir/0003-glitched-cfs-additions.patch" && _tkg_patcher
    fi
-
-  if [ "${_cpusched}" = "cfs" ] || [ "${_cpusched}" = "cacule" ] || [ "${_cpusched}" = "tt" ] || [ "${_cpusched}" = "bore" ]; then
+  elif [ "${_cpusched}" = "cfs" ]; then
    _msg="Applying Glitched CFS patch"
    tkgpatch="$srcdir/0003-glitched-cfs.patch" && _tkg_patcher
+    _msg="Applying Glitched CFS additions patch"
+    tkgpatch="$srcdir/0003-glitched-cfs-additions.patch" && _tkg_patcher
  fi

  fi
@@ -876,7 +916,8 @@ _tkg_srcprep() {

  # ccache fix
  if [ "$_noccache" != "true" ]; then
-    if { [ "$_distro" = "Arch" ] && pacman -Qq ccache &> /dev/null; } || { [ "$_distro" = "Ubuntu" ] && dpkg -l ccache > /dev/null; }; then
+    if { [ "$_distro" = "Arch" ] && pacman -Qq ccache &> /dev/null; } || { [ "$_distro" = "Ubuntu" ] && dpkg -l ccache > /dev/null; }\
+	    || { [ "$_distro" = "Void" ] && xbps-query -s ccache > /dev/null; } ; then
      _disable "GCC_PLUGINS"
    fi
  fi
@@ -1582,7 +1623,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
  # Community patches
  if [ -n "$_community_patches" ]; then
    if [ ! -d "$_where/../community-patches" ]; then
-      cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${_kernel_work_folder_abs}"
+      cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${srcdir}/${_srcpath}"
    fi
    _community_patches=($_community_patches)
    mkdir -p "$_where"/linux"$_basever"-tkg-userpatches
@@ -1608,7 +1649,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
    rm -f "$_where"/linux"$_basever"-tkg-userpatches/$_p
  done

-  if [ "$_distro" = "Arch" ]; then
+  if [ "$_distro" = "Arch" ] || [ "$_distro" = "Void" ]; then
    # don't run depmod on 'make install'. We'll do this ourselves in packaging
    sed -i '2iexit 0' scripts/depmod.sh

@@ -1677,12 +1718,17 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
    fi
  fi

+  # set _menuconfig early for Void
+  if [ "$_distro" = "Void" ]; then
+    _menuconfig="Void"
+  fi
+
  # rewrite configuration
  msg2 "Setting config"
  make ${_config_updating} ${llvm_opt} |& tee -a "$_where"/logs/prepare.log.txt

  # menuconfig / nconfig
-  if [ -z "$_menunconfig" ]; then
+  if [ -z "$_menunconfig" ] && [ "$_distro" != "Void" ]; then
    plain ""
    plain "*Optional* For advanced users - Do you want to use make menuconfig or nconfig"
    plain "to configure the kernel before building it?"
@@ -1724,11 +1770,16 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
      fi
      if [ -z "$_diffconfig_name" ]; then
        echo 'No file name given, not generating config fragment.'
+      else (
+        if [ "$_distro" = "Arch" ] || [ "$_ispkgbuild" = "true" ]; then
+          prev_pwd="${PWD:-$(pwd)}/linux-src-git"
+          cd "$_where" || exit
        else
-        pushd "$_kernel_work_folder_abs"
-        scripts/diffconfig -m .config.orig .config > "$_where/$_diffconfig_name"
-        popd
+          prev_pwd="${PWD:-$(pwd)}"
+          cd "$_where" || exit
        fi
+        "${prev_pwd}/scripts/diffconfig" -m "${prev_pwd}/.config.orig" "${prev_pwd}/.config" > "$_diffconfig_name"
+      ) fi
    fi
    rm .config.orig
  fi
@@ -1758,6 +1809,12 @@ exit_cleanup() {
  # Remove winesync rules file
  rm -f "$_where"/winesync.rules

+  # Remove RPM temporary files left
+  rm -rf ${HOME}/.cache/linux-tkg-rpmbuild
+  if [ "$_distro" != "Arch" ] && [ "$_use_tmpfs" = "true" ]; then
+    rm -rf "$_tmpfs_path/linux-tkg"
+  fi
+
  # Community patches removal in case of failure
  for _p in ${_community_patches[@]}; do
    rm -f "$_where"/linux"$_basever"-tkg-userpatches/"$_p"
@@ -1845,5 +1902,7 @@ exit_cleanup() {
    sed -i 's/\x1b(B//g' "$_where"/logs/shell-output.log.txt
  fi
 }
-
+# Void has its own clean function, this breaks it so ignore it
+if [ "$_distro" != "Void" ]; then
  trap exit_cleanup EXIT
+fi
--- a/linux-tkg-patches/5.10/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.10/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.11/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.11/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.12/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.12/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.13/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.13/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.14/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.14/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.15/0007-v5.15-fsync.patch
+++ b/linux-tkg-patches/5.15/0007-v5.15-fsync.patch
@@ -68,7 +68,7 @@ Signed-off-by: André Almeida <andrealmeid@collabora.com>
 Adjusted for v5.9: Removed `put_futex_key` calls.
 ---
 include/uapi/linux/futex.h |  20 +++
- kernel/futex/core.c             | 348 +++++++++++++++++++++++++++++++++++++
+ kernel/futex.c             | 348 +++++++++++++++++++++++++++++++++++++
 2 files changed, 368 insertions(+)

 diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -114,10 +114,10 @@ index a89eb0accd5e2e..580001e89c6cae 100644
 +};
 +
 #endif /* _UAPI_LINUX_FUTEX_H */
-diff --git a/kernel/futex/core.c b/kernel/futex/core.c
+diff --git a/kernel/futex.c b/kernel/futex.c
 index 408cad5e89680f..c30930a955cece 100644
--- a/kernel/futex/core.c
-+++ b/kernel/futex/core.c
+--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -197,6 +197,8 @@ struct futex_pi_state {
  * @bitset:		bitset for the optional bitmasked wakeup
  * @requeue_state:	State field for futex_requeue_pi()
@@ -536,7 +536,7 @@ Subject: [PATCH] futex: Add Proton compatibility code

 ---
 include/uapi/linux/futex.h | 2 +-
- kernel/futex/core.c             | 3 ++-
+ kernel/futex.c             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

 diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -552,10 +552,10 @@ index 580001e89c6cae..a3e760886b8e7e 100644

 #define FUTEX_PRIVATE_FLAG	128
 #define FUTEX_CLOCK_REALTIME	256
-diff --git a/kernel/futex/core.c b/kernel/futex/core.c
+diff --git a/kernel/futex.c b/kernel/futex.c
 index c30930a955cece..aa33e66df5c9df 100644
--- a/kernel/futex/core.c
-+++ b/kernel/futex/core.c
+--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -4002,7 +4002,7 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t)
 		return -EINVAL;

--- a/linux-tkg-patches/5.15/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.15/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.16/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.16/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.17/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.17/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.18/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.18/0013-fedora-rpm.patch
@@ -1,53 +1,27 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.19/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.19/0013-fedora-rpm.patch
@@ -1,53 +1,27 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.4/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.4/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.7/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.7/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.8/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.8/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/5.9/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.9/0013-fedora-rpm.patch
@@ -1,53 +1,28 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+# and fix akmod-nvidia
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/6.0/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/6.0/0013-fedora-rpm.patch
@@ -1,53 +1,27 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch
+++ b/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch
@@ -90612,7 +90612,7 @@ index 5cfc95a52bc3..be075882450a 100644
 }
 
 static DEFINE_STATIC_KEY_FALSE(trace_no_verify);
-@@ -6793,7 +6789,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
+@@ -6792,12 +6788,12 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 	trace_access_lock(iter->cpu_file);
 	while (trace_find_next_entry_inc(iter) != NULL) {
 		enum print_line_t ret;
@@ -90621,19 +90621,7 @@ index 5cfc95a52bc3..be075882450a 100644
 
 		ret = print_trace_line(iter);
 		if (ret == TRACE_TYPE_PARTIAL_LINE) {
-@@ -6803,7 +6799,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
- 			 * In this case, we need to consume it, otherwise, loop will peek
- 			 * this event next time, resulting in an infinite loop.
- 			 */
-			if (save_len == 0) {
-+			if (save_pos == 0) {
- 				iter->seq.full = 0;
- 				trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n");
- 				trace_consume(iter);
-@@ -6811,7 +6807,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
- 			}
-
- 			/* In other cases, don't print partial lines */
+ 			/* don't print partial lines */
 -			iter->seq.seq.len = save_len;
 +			iter->seq.seq.pos = save_pos;
 			break;
--- a/linux-tkg-patches/6.1/0009-prjc_v6.1-r0.patch
+++ b/linux-tkg-patches/6.1/0009-prjc_v6.1-r0.patch
--- a/linux-tkg-patches/6.1/0012-misc-additions.patch
+++ b/linux-tkg-patches/6.1/0012-misc-additions.patch
--- a/linux-tkg-patches/6.1/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/6.1/0013-fedora-rpm.patch
@@ -1,53 +1,27 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep
--- a/linux-tkg-patches/6.2/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/6.2/0013-fedora-rpm.patch
@@ -1,53 +1,27 @@
+# Remove the obsoletes line in kernel-headers
+# Add provides for kernel-devel so there's no conflict
+
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
-@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
- $S	Source: kernel-$__KERNELRELEASE.tar.gz
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%description headers
-@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
- $S$M	Group: System Environment/Kernel
+@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
- $S$M	AutoReqProv: no
-@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
- $S$M
-+$S	# Opt out of a lot of Fedora hardening flags etc...
-+$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
-+$S	%undefine _package_note_file
-+$S	%undefine _auto_set_build_flags
-+$S	%undefine _include_frame_pointers
-+$S	%define _build_id_flags -Wl,--build-id=none
-+$S	%undefine _annotated_build
-+$S	%undefine _fortify_level
-+$S	%undefine _hardened_build
-+$S	%global _lto_cflags %{nil}
-+$S	%global _configure_gnuconfig_hack 0
-+$S	%global _configure_libtool_hardening_hack 0
-+$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
-+$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
-+$S	%define _build_id_links none
-+$S
- $S	%prep