Skip to content

Commit 71541fd

Browse files
ventureooventureoo
authored
Fix applying of NVIDIA-related patches (#205)
* Ignore applying patches for NVIDIA module through the main loop This fixes the patch applying behavior for kernel-manager * Increase pkgrel god, please let someone write a script to automate this in the new year
1 parent b76a274 commit 71541fd

File tree

21 files changed

+64
-53
lines changed

21 files changed

+64
-53
lines changed

‎linux-bore/.SRCINFO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pkgbase = linux-bore
44
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
55
pkgver = 6.6.8
6-
pkgrel = 1
6+
pkgrel = 2
77
url = https://github.com/CachyOS/linux-cachyos
88
arch = x86_64
99
arch = x86_64_v3

‎linux-bore/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
178178
_srcname=linux-${_stable}
179179
#_srcname=linux-${_major}
180180
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
181-
pkgrel=2
181+
pkgrel=3
182182
_kernver=$pkgver-$pkgrel
183183
arch=('x86_64' 'x86_64_v3')
184184
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,8 @@ fi
222222

223223
# NVIDIA pre-build module support
224224
if [ -n "$_build_nvidia" ]; then
225-
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
226-
source+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
225+
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
226+
"$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
227227
fi
228228

229229
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
277277
src="${src%%::*}"
278278
src="${src##*/}"
279279
src="${src%.zst}"
280+
[[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
280281
[[ $src = *.patch ]] || continue
281282
echo "Applying patch $src..."
282283
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
644645

645646
# Temporary fix for fbdev=1
646647
# 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
647-
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
648+
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
648649
fi
649650
}
650651

‎linux-cachyos-bore/.SRCINFO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = linux-cachyos-bore
22
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
33
pkgver = 6.6.8
4-
pkgrel = 2
4+
pkgrel = 3
55
url = https://github.com/CachyOS/linux-cachyos
66
arch = x86_64
77
arch = x86_64_v3

‎linux-cachyos-bore/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
178178
_srcname=linux-${_stable}
179179
#_srcname=linux-${_major}
180180
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
181-
pkgrel=2
181+
pkgrel=3
182182
_kernver=$pkgver-$pkgrel
183183
arch=('x86_64' 'x86_64_v3')
184184
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,8 @@ fi
222222

223223
# NVIDIA pre-build module support
224224
if [ -n "$_build_nvidia" ]; then
225-
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
226-
source+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
225+
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
226+
"$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
227227
fi
228228

229229
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
277277
src="${src%%::*}"
278278
src="${src##*/}"
279279
src="${src%.zst}"
280+
[[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
280281
[[ $src = *.patch ]] || continue
281282
echo "Applying patch $src..."
282283
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
644645

645646
# Temporary fix for fbdev=1
646647
# 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
647-
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
648+
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
648649
fi
649650
}
650651

‎linux-cachyos-eevdf/.SRCINFO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = linux-cachyos-eevdf
22
pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements
33
pkgver = 6.6.8
4-
pkgrel = 2
4+
pkgrel = 3
55
url = https://github.com/CachyOS/linux-cachyos
66
arch = x86_64
77
arch = x86_64_v3

‎linux-cachyos-eevdf/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
178178
_srcname=linux-${_stable}
179179
#_srcname=linux-${_major}
180180
pkgdesc='Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements'
181-
pkgrel=2
181+
pkgrel=3
182182
_kernver=$pkgver-$pkgrel
183183
arch=('x86_64' 'x86_64_v3')
184184
url="https://github.com/CachyOS/linux-cachyos"
@@ -222,8 +222,8 @@ fi
222222

223223
# NVIDIA pre-build module support
224224
if [ -n "$_build_nvidia" ]; then
225-
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
226-
source+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
225+
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
226+
"$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
227227
fi
228228

229229
## ToDo: Adjust for new Scheduler Changes
@@ -277,6 +277,7 @@ prepare() {
277277
src="${src%%::*}"
278278
src="${src##*/}"
279279
src="${src%.zst}"
280+
[[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
280281
[[ $src = *.patch ]] || continue
281282
echo "Applying patch $src..."
282283
patch -Np1 < "../$src"
@@ -644,7 +645,7 @@ prepare() {
644645

645646
# Temporary fix for fbdev=1
646647
# 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
647-
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
648+
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
648649
fi
649650
}
650651

‎linux-cachyos-hardened/.SRCINFO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = linux-cachyos-hardened
22
pkgdesc = Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements
33
pkgver = 6.6.8
4-
pkgrel = 3
4+
pkgrel = 4
55
url = https://github.com/CachyOS/linux-cachyos
66
arch = x86_64
77
arch = x86_64_v3

‎linux-cachyos-hardened/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
178178
_srcname=linux-${_stable}
179179
#_srcname=linux-${_major}
180180
pkgdesc='Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements'
181-
pkgrel=3
181+
pkgrel=4
182182
_kernver=$pkgver-$pkgrel
183183
arch=('x86_64' 'x86_64_v3')
184184
url="https://github.com/CachyOS/linux-cachyos"
@@ -218,8 +218,8 @@ fi
218218

219219
# NVIDIA pre-build module support
220220
if [ -n "$_build_nvidia" ]; then
221-
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
222-
source+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
221+
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
222+
"$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
223223
fi
224224

225225
## ToDo: Adjust for new Scheduler Changes
@@ -273,6 +273,7 @@ prepare() {
273273
src="${src%%::*}"
274274
src="${src##*/}"
275275
src="${src%.zst}"
276+
[[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
276277
[[ $src = *.patch ]] || continue
277278
echo "Applying patch $src..."
278279
patch -Np1 < "../$src"
@@ -640,7 +641,7 @@ prepare() {
640641

641642
# Temporary fix for fbdev=1
642643
# 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
643-
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
644+
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
644645
fi
645646
}
646647

‎linux-cachyos-lts/.SRCINFO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = linux-cachyos-lts
22
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
33
pkgver = 6.1.69
4-
pkgrel = 2
4+
pkgrel = 3
55
url = https://github.com/CachyOS/linux-cachyos
66
arch = x86_64
77
arch = x86_64_v3

‎linux-cachyos-lts/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ _stable=${_major}.${_minor}
196196
_srcname=linux-${_stable}
197197
#_srcname=linux-${_major}
198198
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
199-
pkgrel=2
199+
pkgrel=3
200200
_kernver=$pkgver-$pkgrel
201201
arch=('x86_64' 'x86_64_v3')
202202
url="https://github.com/CachyOS/linux-cachyos"
@@ -237,8 +237,8 @@ fi
237237

238238
# NVIDIA pre-build module support
239239
if [ -n "$_build_nvidia" ]; then
240-
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
241-
source+=("nvidia-drm-hotplug-workqueue.nvpatch::$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
240+
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
241+
"$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
242242
fi
243243

244244
case "$_cpusched" in
@@ -293,6 +293,7 @@ prepare() {
293293
for src in "${source[@]}"; do
294294
src="${src%%::*}"
295295
src="${src##*/}"
296+
[[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
296297
[[ $src = *.patch ]] || continue
297298
echo "Applying patch $src..."
298299
patch -Np1 < "../$src"
@@ -667,7 +668,7 @@ prepare() {
667668

668669
# Temporary fix for fbdev=1
669670
# 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
670-
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.nvpatch" -d "${srcdir}/${_nv_pkg}"
671+
patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
671672
fi
672673
}
673674

0 commit comments

Comments
 (0)