diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index fdd50af..15ed82c 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -5,27 +5,27 @@ pkgbase=nvidia pkgname=(nvidia nvidia-dkms) -pkgver=390.12 +pkgver=390.25 _extramodules=extramodules-4.15-ARCH pkgrel=99 pkgdesc="NVIDIA drivers for linux" arch=('x86_64') url="http://www.nvidia.com/" -makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.14' 'linux-headers<4.15') +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 'linux-headers<4.16') license=('custom') options=('!strip') source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha256sums=('68c744abc7f42eaa9e640d90ecd3c7691a74b84584b83b776488ef1916f8eb43') +sha256sums=('02263bc81b66e68fc8224447b249f4f0ca4ae201c467e236d917be2fe187f3d6') _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" - + # Change to GPL license find . -name '*.c' -type f -print0 | xargs -0 sed -i -E 's/MODULE_LICENSE\("(.*)"\)/MODULE_LICENSE\("GPL"\)/g' - + cp -a kernel kernel-dkms cd kernel-dkms sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf @@ -42,9 +42,6 @@ DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf # Gift for linux-rt guys sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf - - cd ../kernel - #patch -p1 -i ../../../4-15.patch } build() { @@ -55,7 +52,7 @@ build() { package_nvidia() { pkgdesc="NVIDIA drivers for linux" - depends=('linux>=4.14' 'linux<4.15' "nvidia-utils=${pkgver}" 'libgl') + depends=('linux>=4.15' 'linux<4.16' "nvidia-utils=${pkgver}" 'libgl') install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \ "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko @@ -63,7 +60,9 @@ package_nvidia() { find "${pkgdir}" -name '*.ko' -exec gzip -n {} + echo "blacklist nouveau" | - install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE" } package_nvidia-dkms() { @@ -79,5 +78,7 @@ package_nvidia-dkms() { cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" echo "blacklist nouveau" | - install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE" }