Skip to content

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

Make open nvidia modules conflict with closed ones (#267)

Vasiliy Stelmachenok820acd41efb5
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 9975ed8c..08acd113 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index a51f3b10..3a16d2ab 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -717,6 +717,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -730,6 +731,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD
index d5d87d12..5013cd7c 100644
--- a/linux-cachyos-echo/PKGBUILD
+++ b/linux-cachyos-echo/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 4bad8c86..07149b9d 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index b7c9b98a..53cd02b9 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -714,6 +714,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -727,6 +728,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 75b76f30..548b5076 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -783,6 +783,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -796,6 +797,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 7e509b65..87bfb663 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -716,6 +716,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
@@ -730,6 +731,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index b16465b5..3cc7f2ef 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index db32577f..be3182d8 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index e8ac5515..0e94ba9a 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 3fff906e..ecb6d45f 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia-open")
license=('custom')
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
provides=('NVIDIA-MODULE')
+ conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
cd "${srcdir}/${_nv_open_pkg}"