Skip to content

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

Include nvidia patch again

Peter Jung41787ef66db2
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index 29c96262..4c0a74f6 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 7d67136e..6b9994a7 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 dafdc1cd..3aa13c3d 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 308672af..fc854b6d 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=6a58cf0ba7a3db11a5acf041cc503e8b7afb0b56")
+ source+=("git+https://github.com/cachyos/zfs.git#commit=c883088df83ced3a2b8b38e6d89a5e63fb153ee4")
fi
# NVIDIA pre-build module support
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index cdb112a3..195f8586 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -215,7 +215,8 @@ 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")
+ 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")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -264,6 +265,7 @@ 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"
@@ -555,6 +557,9 @@ 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 de5be43b..f477e48b 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 84abb4b7..cba07812 100644
--- a/linux-cachyos-rt/PKGBUILD
+++ b/linux-cachyos-rt/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 35e31bbd..16104105 100644
--- a/linux-cachyos-sched-ext-debug/PKGBUILD
+++ b/linux-cachyos-sched-ext-debug/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 d1014f18..02805812 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 8252107d..f843c217 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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 56640883..9ae5eab6 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -212,7 +212,8 @@ 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")
+ 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")
fi
## List of CachyOS schedulers
@@ -252,6 +253,7 @@ 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"
@@ -521,6 +523,9 @@ 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
}