Skip to content

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

PKGBUILD: Drop support for building the nvidia (closed) module

Peter Jung9366b7fc9b35
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index b4b91386..163b7a07 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -179,7 +175,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -222,7 +213,6 @@ if [ "$_build_nvidia_open" = "yes" ]; then
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
fi
-
## List of CachyOS schedulers
case "$_cpusched" in
cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
@@ -454,14 +444,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -496,11 +478,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -727,7 +704,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 74beb08f..6c948432 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -179,7 +175,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -453,14 +444,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -495,11 +478,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -726,7 +704,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index a540d395..49582a15 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -111,10 +111,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -178,7 +174,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -211,17 +207,13 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
fi
+
## List of CachyOS schedulers
case "$_cpusched" in
cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
@@ -456,14 +448,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -498,11 +482,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -729,7 +708,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index b6eb3921..d5a52368 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -179,7 +175,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -453,14 +444,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -495,11 +478,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -726,7 +704,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 730604a3..ec28f0f7 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -179,7 +175,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=fe5ed524c72e0b2e2cd4c47ee5bc987290e89666")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -453,14 +444,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -491,11 +474,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -717,7 +695,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 094882b7..5b443bd1 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -119,10 +119,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -183,7 +179,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -215,11 +211,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=fe5ed524c72e0b2e2cd4c47ee5bc987290e89666")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -455,14 +446,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -497,11 +480,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -718,7 +696,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index d1bee367..8788a48d 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -205,7 +201,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -236,11 +232,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -515,14 +506,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -557,11 +540,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -792,7 +770,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 191c0bef..ab14e77b 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -179,7 +175,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -453,14 +444,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -495,11 +478,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -726,7 +704,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index 756b6a7a..7dc970b7 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -112,10 +112,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -179,7 +175,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -210,11 +206,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -453,14 +444,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -495,11 +478,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -726,7 +704,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 46acd1d6..86b10035 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -111,10 +111,6 @@
# If you use ZFS, refrain from building the RT kernel
: "${_build_zfs:=no}"
-# Builds the nvidia module and package it into a own base
-# This does replace the requirement of nvidia-dkms
-: "${_build_nvidia:=no}"
-
# Builds the open nvidia module and package it into a own base
# This does replace the requirement of nvidia-open-dkms
# Use this only if you have Turing+ GPU
@@ -204,7 +200,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=580.119.02
+_nv_ver=590.48.01
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@@ -235,11 +231,6 @@ if [ "$_build_zfs" = "yes" ]; then
source+=("git+https://github.com/cachyos/zfs.git#commit=7de9800e5ce45d03c797be57a3e959fc914b2adb")
fi
-# NVIDIA pre-build module support
-if [ "$_build_nvidia" = "yes" ]; then
- source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
- "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
-fi
if [ "$_build_nvidia_open" = "yes" ]; then
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
@@ -514,14 +505,6 @@ prepare() {
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
- if [ "$_build_nvidia" = "yes" ]; then
- cd "${srcdir}"
- sh "${_nv_pkg}.run" --extract-only
-
- # Use fbdev and modeset as default
- patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
- fi
-
if [ "$_build_nvidia_open" = "yes" ]; then
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
@@ -556,11 +539,6 @@ build() {
SYSSRC="${srcdir}/${_srcname}"
SYSOUT="${srcdir}/${_srcname}"
)
- if [ "$_build_nvidia" = "yes" ]; then
- MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
- cd "${srcdir}/${_nv_pkg}/kernel"
- make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
- fi
if [ "$_build_nvidia_open" = "yes" ]; then
cd "${srcdir}/${_nv_open_pkg}"
@@ -798,7 +776,6 @@ pkgname=("$pkgbase")
[ "$_build_debug" = "yes" ] && pkgname+=("$pkgbase-dbg")
pkgname+=("$pkgbase-headers")
[ "$_build_zfs" = "yes" ] && pkgname+=("$pkgbase-zfs")
-[ "$_build_nvidia" = "yes" ] && pkgname+=("$pkgbase-nvidia")
[ "$_build_nvidia_open" = "yes" ] && pkgname+=("$pkgbase-nvidia-open")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {