Skip to content

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

Fix applying of NVIDIA-related patches (#205)

Vasiliy Stelmachenok71541fd0ef93
diff --git a/linux-bore/.SRCINFO b/linux-bore/.SRCINFO
index a0303178..3f5f8868 100644
--- a/linux-bore/.SRCINFO
+++ b/linux-bore/.SRCINFO
@@ -3,7 +3,7 @@
pkgbase = linux-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index bea7dc24..f6f2d6c4 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
index 54ef5391..9784f644 100644
--- a/linux-cachyos-bore/.SRCINFO
+++ b/linux-cachyos-bore/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index cedb855e..bb70e7ea 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO
index 0d4561d7..ba5c11e3 100644
--- a/linux-cachyos-eevdf/.SRCINFO
+++ b/linux-cachyos-eevdf/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-eevdf
pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 5a0094e8..63e8b408 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO
index a641dbf9..09ba19f8 100644
--- a/linux-cachyos-hardened/.SRCINFO
+++ b/linux-cachyos-hardened/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-hardened
pkgdesc = Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 44488cbd..37a8c007 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=3
+pkgrel=4
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -218,8 +218,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -273,6 +273,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -640,7 +641,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO
index e3132c07..e5918f41 100644
--- a/linux-cachyos-lts/.SRCINFO
+++ b/linux-cachyos-lts/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-lts
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.69
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index d66e439c..663fbad6 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -196,7 +196,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -237,8 +237,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
case "$_cpusched" in
@@ -293,6 +293,7 @@ prepare() {
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -667,7 +668,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 11d0fb17..f8b54fb2 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -219,8 +219,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -270,6 +270,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -637,7 +638,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-rt-bore/.SRCINFO b/linux-cachyos-rt-bore/.SRCINFO
index 115af9d2..d5487114 100644
--- a/linux-cachyos-rt-bore/.SRCINFO
+++ b/linux-cachyos-rt-bore/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-rt-bore
pkgdesc = Linux kernel with BORE-RT patches by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 6
+ pkgrel = 7
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 27326be4..3f76ce8e 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux kernel with BORE-RT patches by CachyOS with other patches and improvements'
-pkgrel=6
+pkgrel=7
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-rt/.SRCINFO b/linux-cachyos-rt/.SRCINFO
index c1ea3f41..4e5eec67 100644
--- a/linux-cachyos-rt/.SRCINFO
+++ b/linux-cachyos-rt/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-rt
pkgdesc = Linux kernel with RT patches by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD
index 55901d5f..ce304662 100644
--- a/linux-cachyos-rt/PKGBUILD
+++ b/linux-cachyos-rt/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux kernel with RT patches by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-sched-ext/.SRCINFO b/linux-cachyos-sched-ext/.SRCINFO
index eccbcdb2..a48a5df2 100644
--- a/linux-cachyos-sched-ext/.SRCINFO
+++ b/linux-cachyos-sched-ext/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-sched-ext
pkgdesc = Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index 4eec76f3..b1b608a8 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO
index 6d95110c..570c0ffc 100644
--- a/linux-cachyos-server/.SRCINFO
+++ b/linux-cachyos-server/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-server
pkgdesc = Linux EEVDF scheduler Kernel by CachyOS targeted for Servers
pkgver = 6.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index a596fdda..580e3356 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux EEVDF scheduler Kernel by CachyOS targeted for Servers'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}
diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
index 8df18876..6d01d698 100644
--- a/linux-cachyos/.SRCINFO
+++ b/linux-cachyos/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos
pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index c64e34b8..f2af881e 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=3
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,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+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+ source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+ "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
fi
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
src="${src%.zst}"
+ [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
# Temporary fix for fbdev=1
# https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
- patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
+ patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
fi
}