From 049aecdd042dd459f688b23ecb45fb9514581326 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 23 Feb 2024 17:53:18 +0100 Subject: [PATCH] Drop patches for the nvidia-module Signed-off-by: Peter Jung --- .gitignore | 2 +- linux-bore/PKGBUILD | 6 ------ linux-cachyos-bore/PKGBUILD | 6 ------ linux-cachyos-eevdf/PKGBUILD | 6 ------ linux-cachyos-hardened/PKGBUILD | 6 ------ linux-cachyos-lts/PKGBUILD | 6 ------ linux-cachyos-rc/PKGBUILD | 6 ------ linux-cachyos-rt-bore/PKGBUILD | 6 ------ linux-cachyos-rt/PKGBUILD | 6 ------ linux-cachyos-sched-ext/PKGBUILD | 6 ------ linux-cachyos-server/PKGBUILD | 6 ------ linux-cachyos/PKGBUILD | 6 ------ 12 files changed, 1 insertion(+), 67 deletions(-) diff --git a/.gitignore b/.gitignore index 01ae28656..b38d4ada4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,6 @@ *.log.* *.sig *.xz* - +*.run pkg/ src/ diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD index 213c1dc68..46d41b1f2 100644 --- a/linux-bore/PKGBUILD +++ b/linux-bore/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 1803e611f..017c0ffcb 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index ed7e41e66..843397754 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index 82bce72e1..3d09b578e 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index 41a3aa051..693414b9a 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -555,12 +555,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 06245876d..8b3153159 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index ae49fc3af..551c7b1da 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD index 608b8d0ca..a141877ce 100644 --- a/linux-cachyos-rt/PKGBUILD +++ b/linux-cachyos-rt/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index 9573e1fc9..56711814f 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -557,12 +557,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 88a79d3ca..8427a2cb5 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi } diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 7489fee3f..5d3bd863f 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -553,12 +553,6 @@ prepare() { if [ -n "$_build_nvidia" ]; then cd "${srcdir}" sh "${_nv_pkg}.run" --extract-only - - # 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.patch" -d "${srcdir}/${_nv_pkg}" - # Temporary fix for nvidia module build - patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi }