diff options
author | Britney Fransen <brfransen@gmail.com> | 2017-12-09 14:34:12 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2017-12-09 14:34:12 (GMT) |
commit | f06d8e1bedfcf6d424a4736d43f366d95fb33690 (patch) | |
tree | a78baa8ac9914820a0c470c391772bcdb9e17b4d /abs/core/nvidia | |
parent | ada13c3f17134c5885f686509d128080450efa1b (diff) | |
parent | e4b0dec19f02e6d8e995b19a22110cac26f07ac4 (diff) | |
download | linhes_pkgbuild-f06d8e1bedfcf6d424a4736d43f366d95fb33690.zip linhes_pkgbuild-f06d8e1bedfcf6d424a4736d43f366d95fb33690.tar.gz linhes_pkgbuild-f06d8e1bedfcf6d424a4736d43f366d95fb33690.tar.bz2 |
Merge branch 'testing'
Diffstat (limited to 'abs/core/nvidia')
-rw-r--r-- | abs/core/nvidia/PKGBUILD | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 470343c..d6db1ad 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -5,22 +5,19 @@ pkgbase=nvidia pkgname=(nvidia nvidia-dkms) -pkgver=381.22 +pkgver=387.22 _extramodules=extramodules-4.9-ARCH -pkgrel=2 +pkgrel=8 pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.nvidia.com/" makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.9' 'linux-headers<4.10') license=('custom') options=('!strip') -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('8825cec1640739521689bd80121d1425') -md5sums_x86_64=('0e9590d48703c8baa034b6f0f8bbf1e5') +source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +sha256sums=('2056b386f619ed096ee3c2267c495c6b00d1a2a4c933f0635befcf4e69c3856c') -[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" +_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" prepare() { sh "${_pkg}.run" --extract-only @@ -39,6 +36,9 @@ BUILT_MODULE_NAME[2]="nvidia-modeset"\ DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ BUILT_MODULE_NAME[3]="nvidia-drm"\ 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 } build() { @@ -52,22 +52,13 @@ package_nvidia() { depends=('linux>=4.9' 'linux<4.10' "nvidia-utils=${pkgver}" 'libgl') install=nvidia.install - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko" - - if [[ "$CARCH" = "x86_64" ]]; then - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" - fi + install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \ + "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + find "${pkgdir}" -name '*.ko' -exec gzip -n {} + - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + echo "blacklist nouveau" | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" } package_nvidia-dkms() { @@ -78,7 +69,10 @@ package_nvidia-dkms() { conflicts+=('nvidia') cd ${_pkg} - install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + + install -dm 755 "${pkgdir}"/usr/src cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" - echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + + echo "blacklist nouveau" | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" } |