[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-utils.install)

[Sven-Hendrik Haase]

    Date: Tuesday, June 24, 2014 @ 23:39:26
  Author: svenstaro
Revision: 215429

upgpkg: nvidia-utils 337.25-2

Fix FS#40698

Added:
  nvidia-utils/trunk/nvidia-utils.install
Modified:
  nvidia-utils/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   24 ++++++++++++++++++------
 nvidia-utils.install |   14 ++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-24 20:06:31 UTC (rev 215428)
+++ PKGBUILD	2014-06-24 21:39:26 UTC (rev 215429)
@@ -1,10 +1,11 @@
 # $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 # Contributor: James Rayner <iphitus at gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
 pkgver=337.25
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -26,9 +27,10 @@
     done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
 }
 
-build() {
-    cd "${srcdir}"
+prepare() {
     sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+    bsdtar -xf nvidia-persistenced-init.tar.bz2
 }
 
 package_opencl-nvidia() {
@@ -35,7 +37,7 @@
     pkgdesc="OpenCL implemention for NVIDIA"
     depends=('libcl' 'zlib')
     optdepends=('opencl-headers: headers necessary for OpenCL development')
-    cd "${srcdir}/${_pkg}"
+    cd "${_pkg}"
 
     # OpenCL
     install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
@@ -53,7 +55,7 @@
     depends=('nvidia-utils')
     conflicts=('libgl')
     provides=('libgl')
-    cd "${srcdir}/${_pkg}"
+    cd "${_pkg}"
 
     mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
     ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
@@ -86,7 +88,8 @@
     optdepends=('gtk2: nvidia-settings'
                 'xorg-server-devel: nvidia-xconfig'
                 'opencl-nvidia: OpenCL support')
-    cd "${srcdir}/${_pkg}"
+    install="${pkgname}.install"
+    cd "${_pkg}"
 
     # X driver
     install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
@@ -146,12 +149,20 @@
 
     # nvidia-cuda-mps
     install -D -m755 nvidia-cuda-mps-server "${pkgdir}/usr/bin/nvidia-cuda-mps-server"
+    install -D -m755 nvidia-cuda-mps-control "${pkgdir}/usr/bin/nvidia-cuda-mps-control"
     install -D -m644 nvidia-cuda-mps-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-mps-control.1.gz"
 
     # nvidia-modprobe
     # This should be removed if nvidia fixed their uvm module!
     install -D -m4755 nvidia-modprobe "${pkgdir}/usr/bin/nvidia-modprobe"
+    install -D -m644 nvidia-modprobe.1.gz "${pkgdir}/usr/share/man/man1/nvidia-modprobe.1.gz"
 
+    # nvidia-persistenced
+    install -D -m755 nvidia-persistenced "${pkgdir}/usr/bin/nvidia-persistenced"
+    install -D -m644 nvidia-persistenced.1.gz "${pkgdir}/usr/share/man/man1/nvidia-persistenced.1.gz"
+    install -D -m644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service"
+    sed -i 's/__USER__/nvidia-persistenced/' "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service"
+
     # application profiles
     install -D -m644 nvidia-application-profiles-${pkgver}-rc "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-rc"
     install -D -m644 nvidia-application-profiles-${pkgver}-key-documentation "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-key-documentation"
@@ -160,6 +171,7 @@
     ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
     install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README"
     install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog"
+    cp -r html "${pkgdir}/usr/share/doc/nvidia/"
     ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
 
     create_links

Added: nvidia-utils.install
===================================================================
--- nvidia-utils.install	                        (rev 0)
+++ nvidia-utils.install	2014-06-24 21:39:26 UTC (rev 215429)
@@ -0,0 +1,14 @@
+post_install() {
+  if ! getent group nvidia-persistenced >/dev/null; then
+    groupadd -g 143 nvidia-persistenced
+  fi
+  if ! getent passwd nvidia-persistenced >/dev/null; then
+    useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced
+  fi
+}
+
+post_remove() {
+  if getent group nvidia-persistenced >/dev/null; then
+    userdel -f nvidia-persistenced
+  fi
+}