summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--20-nvidia.conf10
-rw-r--r--PKGBUILD32
-rw-r--r--nvidia-340xx.install9
4 files changed, 44 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 572132946e14..bd3b3c7314fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nvidia-340xx
pkgdesc = NVIDIA drivers for linux, 340xx legacy branch
pkgver = 340.108
- pkgrel = 16
+ pkgrel = 17
url = https://www.nvidia.com/
arch = x86_64
license = custom
@@ -11,12 +11,14 @@ pkgbase = nvidia-340xx
conflicts = nvidia
options = !strip
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108-no-compat32.run
+ source = 20-nvidia.conf
source = 0001-kernel-5.7.patch
source = 0002-kernel-5.8.patch
source = 0003-kernel-5.9.patch
source = 0004-kernel-5.10.patch
source = 0005-kernel-5.11.patch
b2sums = 6538bbec53b10f8d20977f9b462052625742e9709ef06e24cf2e55de5d0c55f1620a4bb21396cfd89ebc54c32f921ea17e3e47eaa95abcbc24ecbd144fb89028
+ b2sums = a0266d62a742f8ecd96be767b66af169c09428ba3f718efa1e36f2c69303e35b6437503381b041dd3a88fa86eb82909f8cbf209dbba4a5658fd7bb220a852000
b2sums = 7150233df867a55f57aa5e798b9c7618329d98459fecc35c4acfad2e9772236cb229703c4fa072381c509279d0588173d65f46297231f4d3bfc65a1ef52e65b1
b2sums = b436095b89d6e294995651a3680ff18b5af5e91582c3f1ec9b7b63be9282497f54f9bf9be3997a5af30eec9b8548f25ec5235d969ac00a667a9cddece63d8896
b2sums = 947cb1f149b2db9c3c4f973f285d389790f73fc8c8a6865fc5b78d6a782f49513aa565de5c82a81c07515f1164e0e222d26c8212a14cf016e387bcc523e3fcb1
@@ -25,12 +27,14 @@ pkgbase = nvidia-340xx
pkgname = nvidia-340xx
pkgdesc = NVIDIA drivers for linux, 340xx legacy branch
+ install = nvidia-340xx.install
depends = linux>=5.3.6
depends = nvidia-340xx-utils=340.108
depends = libgl
pkgname = nvidia-340xx-dkms
pkgdesc = NVIDIA driver sources for linux, 340xx legacy branch
+ install = nvidia-340xx.install
depends = dkms
depends = nvidia-340xx-utils=340.108
depends = libgl
diff --git a/20-nvidia.conf b/20-nvidia.conf
new file mode 100644
index 000000000000..179697ba475d
--- /dev/null
+++ b/20-nvidia.conf
@@ -0,0 +1,10 @@
+Section "Files"
+ ModulePath "/usr/lib64/nvidia/xorg"
+ ModulePath "/usr/lib64/xorg/modules"
+EndSection
+
+Section "Device"
+ Identifier "Nvidia Card"
+ Driver "nvidia"
+ VendorName "NVIDIA Corporation"
+EndSection
diff --git a/PKGBUILD b/PKGBUILD
index e159e63a8271..3d04e83ee410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
pkgver=340.108
-pkgrel=16
+pkgrel=17
pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
arch=('x86_64')
url="https://www.nvidia.com/"
@@ -16,6 +16,7 @@ license=('custom')
options=(!strip)
# https://github.com/warpme/minimyth2/tree/master/script/nvidia/nvidia-340.108/files
source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ 20-nvidia.conf
0001-kernel-5.7.patch
0002-kernel-5.8.patch
0003-kernel-5.9.patch
@@ -23,6 +24,7 @@ source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Li
0005-kernel-5.11.patch
)
b2sums=('6538bbec53b10f8d20977f9b462052625742e9709ef06e24cf2e55de5d0c55f1620a4bb21396cfd89ebc54c32f921ea17e3e47eaa95abcbc24ecbd144fb89028'
+ 'a0266d62a742f8ecd96be767b66af169c09428ba3f718efa1e36f2c69303e35b6437503381b041dd3a88fa86eb82909f8cbf209dbba4a5658fd7bb220a852000'
'7150233df867a55f57aa5e798b9c7618329d98459fecc35c4acfad2e9772236cb229703c4fa072381c509279d0588173d65f46297231f4d3bfc65a1ef52e65b1'
'b436095b89d6e294995651a3680ff18b5af5e91582c3f1ec9b7b63be9282497f54f9bf9be3997a5af30eec9b8548f25ec5235d969ac00a667a9cddece63d8896'
'947cb1f149b2db9c3c4f973f285d389790f73fc8c8a6865fc5b78d6a782f49513aa565de5c82a81c07515f1164e0e222d26c8212a14cf016e387bcc523e3fcb1'
@@ -63,6 +65,7 @@ build() {
package_nvidia-340xx() {
pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
depends=('linux>=5.3.6' "nvidia-340xx-utils=$pkgver" 'libgl')
+ install=nvidia-340xx.install
install -Dt "${pkgdir}${_extradir}" -m644 \
"${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
@@ -71,23 +74,28 @@ package_nvidia-340xx() {
echo "blacklist nouveau" |
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia-340xx.conf"
+
+ install -Dm644 "$srcdir/20-nvidia.conf" "$pkgdir/usr/share/nvidia-340xx/20-nvidia.conf"
}
package_nvidia-340xx-dkms() {
- pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
- depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
- optdepends=('linux-headers: Build the module for Arch kernel')
- provides=("nvidia-340xx=$pkgver")
- conflicts+=('nvidia-340xx')
+ pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+ depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+ optdepends=('linux-headers: Build the module for Arch kernel')
+ provides=("nvidia-340xx=$pkgver")
+ conflicts+=('nvidia-340xx')
+ install=nvidia-340xx.install
+
+ cd "${_pkg}"
- cd "${_pkg}"
+ install -dm 755 "${pkgdir}"/usr/src
+ cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+ cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
- install -dm 755 "${pkgdir}"/usr/src
- cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
- cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+ install -Dm644 "$srcdir/20-nvidia.conf" "$pkgdir/usr/share/nvidia-340xx/20-nvidia.conf"
}
# vim:set ts=2 sw=2 et:
diff --git a/nvidia-340xx.install b/nvidia-340xx.install
new file mode 100644
index 000000000000..fbd860f78612
--- /dev/null
+++ b/nvidia-340xx.install
@@ -0,0 +1,9 @@
+post_install() {
+ echo "-> You must tell Xorg to use the nvidia driver with kernels >=5.11.0."
+ echo "-> Minimal xorg config example: /usr/share/nvidia-340xx/20-nvidia.conf"
+ echo "-> To place in /etc/X11.org.conf.d/"
+}
+
+post_upgrade() {
+ post_install
+}