Skip to content

Commit 820acd4

Browse files
ventureooventureoo
authored
Make open nvidia modules conflict with closed ones (#267)
1 parent 95918f1 commit 820acd4

File tree

11 files changed

+22
-0
lines changed

11 files changed

+22
-0
lines changed

‎linux-cachyos-bore/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-deckify/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,7 @@ _package-nvidia(){
717717
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
718718
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
719719
provides=('NVIDIA-MODULE')
720+
conflicts=("$pkgbase-nvidia-open")
720721
license=('custom')
721722

722723
cd "${srcdir}/${_nv_pkg}/"
@@ -730,6 +731,7 @@ _package-nvidia-open(){
730731
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
731732
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
732733
provides=('NVIDIA-MODULE')
734+
conflicts=("$pkgbase-nvidia")
733735
license=(GPL-1.0-only)
734736

735737
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-echo/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-eevdf/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-hardened/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,7 @@ _package-nvidia(){
714714
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
715715
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
716716
provides=('NVIDIA-MODULE')
717+
conflicts=("$pkgbase-nvidia-open")
717718
license=('custom')
718719

719720
cd "${srcdir}/${_nv_pkg}/"
@@ -727,6 +728,7 @@ _package-nvidia-open(){
727728
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
728729
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
729730
provides=('NVIDIA-MODULE')
731+
conflicts=("$pkgbase-nvidia")
730732
license=(GPL-1.0-only)
731733

732734
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-lts/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ _package-nvidia(){
783783
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
784784
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
785785
provides=('NVIDIA-MODULE')
786+
conflicts=("$pkgbase-nvidia-open")
786787
license=('custom')
787788

788789
cd "${srcdir}/${_nv_pkg}/"
@@ -796,6 +797,7 @@ _package-nvidia-open(){
796797
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
797798
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
798799
provides=('NVIDIA-MODULE')
800+
conflicts=("$pkgbase-nvidia")
799801
license=(GPL-1.0-only)
800802

801803
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-rc/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ _package-nvidia(){
716716
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
717717
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
718718
provides=('NVIDIA-MODULE')
719+
conflicts=("$pkgbase-nvidia-open")
719720
license=('custom')
720721

721722
local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
@@ -730,6 +731,7 @@ _package-nvidia-open(){
730731
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
731732
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
732733
provides=('NVIDIA-MODULE')
734+
conflicts=("$pkgbase-nvidia")
733735
license=(GPL-1.0-only)
734736

735737
local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}

‎linux-cachyos-rt-bore/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-sched-ext/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos-server/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

‎linux-cachyos/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ _package-nvidia(){
715715
pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
716716
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
717717
provides=('NVIDIA-MODULE')
718+
conflicts=("$pkgbase-nvidia-open")
718719
license=('custom')
719720

720721
cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
728729
pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
729730
depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
730731
provides=('NVIDIA-MODULE')
732+
conflicts=("$pkgbase-nvidia")
731733
license=(GPL-1.0-only)
732734

733735
cd "${srcdir}/${_nv_open_pkg}"

0 commit comments

Comments
 (0)