Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

Drop nvidia patch

Peter Jung4641d26a6bfe
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index f5793d0c..ef97f282 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index f20a94d4..3a954acf 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index fe326729..11cd7d1f 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index fc854b6d..308672af 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -208,7 +208,7 @@ fi
# ZFS support
if [ -n "$_build_zfs" ]; then
makedepends+=(git)
- source+=("git+https://github.com/cachyos/zfs.git#commit=c883088df83ced3a2b8b38e6d89a5e63fb153ee4")
+ source+=("git+https://github.com/cachyos/zfs.git#commit=6a58cf0ba7a3db11a5acf041cc503e8b7afb0b56")
fi
# NVIDIA pre-build module support
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 195f8586..cdb112a3 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -215,8 +215,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -265,7 +264,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -557,9 +555,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 1fdf138d..5dc0f897 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD
index f84e5e17..3627669b 100644
--- a/linux-cachyos-rt/PKGBUILD
+++ b/linux-cachyos-rt/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-sched-ext-debug/PKGBUILD b/linux-cachyos-sched-ext-debug/PKGBUILD
index c4036342..c54fb8f6 100644
--- a/linux-cachyos-sched-ext-debug/PKGBUILD
+++ b/linux-cachyos-sched-ext-debug/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index 985d8218..261204a2 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index 3a110d67..ea5ed3e0 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 8be06a6a..76ad8aae 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -212,8 +212,7 @@ fi
# NVIDIA pre-build module support
if [ -n "$_build_nvidia" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
fi
## List of CachyOS schedulers
@@ -253,7 +252,6 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
- [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -523,9 +521,6 @@ prepare() {
if [ -n "$_build_nvidia" ]; then
cd "${srcdir}"
sh "${_nv_pkg}.run" --extract-only
-
- # Temporary fix for nvidia module
- patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
fi
}