[pkg-upd] 390.151-6

PKGBUILD

@@ -12,60 +12,46 @@
 
 _linuxprefix=linux510
 _extramodules=extramodules-5.10-MANJARO
-# don't edit here
-pkgver=390.151
 
-_nver=390
-# edit here for new version
-_sver=151
-# edit here for new build
-pkgrel=5
-pkgname=$_linuxprefix-nvidia-${_nver}xx
-_pkgver="${_nver}.${_sver}"
-pkgdesc="NVIDIA drivers for linux."
+pkgname=$_linuxprefix-nvidia-390xx
+pkgdesc="NVIDIA drivers for linux"
+pkgver=390.151
+pkgrel=6
 arch=('x86_64')
 url="http://www.nvidia.com/"
-depends=("$_linuxprefix" "nvidia-390xx-utils=${_pkgver}")
-makedepends=("$_linuxprefix-headers")
+license=('custom')
 groups=("$_linuxprefix-extramodules")
+depends=("$_linuxprefix" "nvidia-utils=$pkgver")
+makedepends=("$_linuxprefix-headers")
 provides=("nvidia=$pkgver" 'NVIDIA-MODULE')
-license=('custom')
-install=nvidia.install
 options=(!strip)
-durl="http://us.download.nvidia.com/XFree86/Linux-x86"
-source=("${durl}_64/${_pkgver}/NVIDIA-Linux-x86_64-${_pkgver}-no-compat32.run")
+install=nvidia.install
+_durl="https://us.download.nvidia.com/XFree86/Linux-x86"
+source=("${_durl}_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
 sha256sums=('6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c')
 
-_pkg="NVIDIA-Linux-x86_64-${_pkgver}-no-compat32"
-
-pkgver() {
-  printf '%s' "${_pkgver}"
-}
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
 prepare() {
     sh "${_pkg}.run" --extract-only
+
     cd "${_pkg}"
     # patches here
 }
 
 build() {
     _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${_pkg}"/kernel
-    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+    cd "${_pkg}"
+    make -C kernel SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 
 package() {
-    install -D -m644 "${_pkg}/kernel/nvidia.ko" \
-        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-    install -D -m644 "${_pkg}/kernel/nvidia-modeset.ko" \
-         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
-    install -D -m644 "${_pkg}/kernel/nvidia-drm.ko" \
-         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
-    install -D -m644 "${_pkg}/kernel/nvidia-uvm.ko" \
-         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+    cd "${_pkg}"
+    install -Dm644 kernel/*.ko -t "${pkgdir}/usr/lib/modules/${_extramodules}/"
 
     # compress each module individually
     find "${pkgdir}" -name '*.ko' -exec xz -T1 {} +
 
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+    install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
 }

nvidia.install

+EXTRAMODULES='extramodules-5.10-MANJARO'
+
 post_install() {
-    EXTRAMODULES='extramodules-5.10-MANJARO'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
+    depmod "$(cat /usr/lib/modules/${EXTRAMODULES}/version)"
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-5.10-MANJARO'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    post_install
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-5.10-MANJARO'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    post_install
 }