[arch-commits] Commit in nvidia/repos (16 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Nov 4 14:46:40 UTC 2015
Date: Wednesday, November 4, 2015 @ 15:46:39
Author: tpowa
Revision: 250101
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/PKGBUILD
(from rev 250100, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/nvidia-4.3-build.patch
(from rev 250100, nvidia/trunk/nvidia-4.3-build.patch)
nvidia/repos/testing-i686/nvidia-dkms.install
(from rev 250100, nvidia/trunk/nvidia-dkms.install)
nvidia/repos/testing-i686/nvidia.install
(from rev 250100, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 250100, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/nvidia-4.3-build.patch
(from rev 250100, nvidia/trunk/nvidia-4.3-build.patch)
nvidia/repos/testing-x86_64/nvidia-dkms.install
(from rev 250100, nvidia/trunk/nvidia-dkms.install)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 250100, nvidia/trunk/nvidia.install)
Deleted:
nvidia/repos/testing-i686/PKGBUILD
nvidia/repos/testing-i686/nvidia-4.3-build.patch
nvidia/repos/testing-i686/nvidia-dkms.install
nvidia/repos/testing-i686/nvidia.install
nvidia/repos/testing-x86_64/PKGBUILD
nvidia/repos/testing-x86_64/nvidia-4.3-build.patch
nvidia/repos/testing-x86_64/nvidia-dkms.install
nvidia/repos/testing-x86_64/nvidia.install
---------------------------------------+
/PKGBUILD | 162 ++++++++++++++++++++++++++++++++
/nvidia-4.3-build.patch | 40 +++++++
/nvidia-dkms.install | 60 +++++++++++
/nvidia.install | 26 +++++
testing-i686/PKGBUILD | 81 ----------------
testing-i686/nvidia-4.3-build.patch | 20 ---
testing-i686/nvidia-dkms.install | 30 -----
testing-i686/nvidia.install | 13 --
testing-x86_64/PKGBUILD | 81 ----------------
testing-x86_64/nvidia-4.3-build.patch | 20 ---
testing-x86_64/nvidia-dkms.install | 30 -----
testing-x86_64/nvidia.install | 13 --
12 files changed, 288 insertions(+), 288 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-i686/PKGBUILD 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=355.11
-_extramodules=extramodules-4.3-ARCH
-pkgrel=5
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
-license=('custom')
-options=(!strip)
-source=('nvidia-4.3-build.patch')
-source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-md5sums=('1e5f60cf8e77af482345549b9436887a')
-md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
-md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
-
-[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
-[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
- # patches here
- patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
-
- cp -a kernel kernel-dkms
- cd kernel-dkms
- sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
- sed -i 's/__JOBS/`nproc`/' dkms.conf
- sed -i 's/__DKMS_MODULES//' dkms.conf
- sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
-}
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
- pkgdesc="NVIDIA drivers for linux"
- depends=('linux>=4.3' 'linux<4.4' "nvidia-utils=${pkgver}" 'libgl')
- install=nvidia.install
-
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-
- if [[ "$CARCH" = "x86_64" ]]; then
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
- fi
-
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-dkms() {
- pkgdesc="NVIDIA driver sources for linux"
- depends=('dkms' "nvidia-utils=$pkgver")
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- conflicts+=('nvidia')
- install=nvidia-dkms.install
-
- cd ${_pkg}
- install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
- cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
- echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 250100, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=355.11
+_extramodules=extramodules-4.3-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
+license=('custom')
+options=(!strip)
+source=('nvidia-4.3-build.patch')
+source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+md5sums=('1e5f60cf8e77af482345549b9436887a')
+md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
+md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
+
+ cp -a kernel kernel-dkms
+ cd kernel-dkms
+ sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+ sed -i 's/__JOBS/`nproc`/' dkms.conf
+ sed -i 's/__DKMS_MODULES//' dkms.conf
+ sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+ pkgdesc="NVIDIA drivers for linux"
+ depends=('linux>=4.3' 'linux<4.4' "nvidia-utils=${pkgver}" 'libgl')
+ install=nvidia.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ fi
+
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-dkms() {
+ pkgdesc="NVIDIA driver sources for linux"
+ depends=('dkms' "nvidia-utils=$pkgver")
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia')
+ install=nvidia-dkms.install
+
+ cd ${_pkg}
+ install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+ cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+ echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
Deleted: testing-i686/nvidia-4.3-build.patch
===================================================================
--- testing-i686/nvidia-4.3-build.patch 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-i686/nvidia-4.3-build.patch 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,20 +0,0 @@
---- a/kernel/nvidia/nv-procfs.c
-+++ b/kernel/nvidia/nv-procfs.c
-@@ -360,7 +360,8 @@ nv_procfs_read_registry(
- registry_keys = ((nvl != NULL) ?
- nvl->registry_keys : nv_registry_keys);
-
-- return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+ seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+ return 0;
- }
-
- static ssize_t
-@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
- void *v
- )
- {
-- return seq_puts(s, s->private);
-+ seq_puts(s, s->private);
-+ return 0;
- }
Copied: nvidia/repos/testing-i686/nvidia-4.3-build.patch (from rev 250100, nvidia/trunk/nvidia-4.3-build.patch)
===================================================================
--- testing-i686/nvidia-4.3-build.patch (rev 0)
+++ testing-i686/nvidia-4.3-build.patch 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,20 @@
+--- a/kernel/nvidia/nv-procfs.c
++++ b/kernel/nvidia/nv-procfs.c
+@@ -360,7 +360,8 @@ nv_procfs_read_registry(
+ registry_keys = ((nvl != NULL) ?
+ nvl->registry_keys : nv_registry_keys);
+
+- return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++ seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++ return 0;
+ }
+
+ static ssize_t
+@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
+ void *v
+ )
+ {
+- return seq_puts(s, s->private);
++ seq_puts(s, s->private);
++ return 0;
+ }
Deleted: testing-i686/nvidia-dkms.install
===================================================================
--- testing-i686/nvidia-dkms.install 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-i686/nvidia-dkms.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,30 +0,0 @@
-#/bin/sh
-
-# arg 1: the new package version
-post_install() {
- dkms add nvidia/${1%-*}
- cat << EOF
-==> To build and install your modules run: dkms install nvidia/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-pre_upgrade() {
- pre_remove "$2"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install "$1"
-}
-
-# arg 1: the old package version
-pre_remove() {
- # Remove modules using dkms
- [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
\ No newline at end of file
Copied: nvidia/repos/testing-i686/nvidia-dkms.install (from rev 250100, nvidia/trunk/nvidia-dkms.install)
===================================================================
--- testing-i686/nvidia-dkms.install (rev 0)
+++ testing-i686/nvidia-dkms.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add nvidia/${1%-*}
+ cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
\ No newline at end of file
Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-i686/nvidia.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.2-ARCH'
- depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: nvidia/repos/testing-i686/nvidia.install (from rev 250100, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.3-ARCH'
+ depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-x86_64/PKGBUILD 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=355.11
-_extramodules=extramodules-4.3-ARCH
-pkgrel=5
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
-license=('custom')
-options=(!strip)
-source=('nvidia-4.3-build.patch')
-source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-md5sums=('1e5f60cf8e77af482345549b9436887a')
-md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
-md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
-
-[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
-[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
- # patches here
- patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
-
- cp -a kernel kernel-dkms
- cd kernel-dkms
- sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
- sed -i 's/__JOBS/`nproc`/' dkms.conf
- sed -i 's/__DKMS_MODULES//' dkms.conf
- sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
-}
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
- pkgdesc="NVIDIA drivers for linux"
- depends=('linux>=4.3' 'linux<4.4' "nvidia-utils=${pkgver}" 'libgl')
- install=nvidia.install
-
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-
- if [[ "$CARCH" = "x86_64" ]]; then
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
- fi
-
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-dkms() {
- pkgdesc="NVIDIA driver sources for linux"
- depends=('dkms' "nvidia-utils=$pkgver")
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- conflicts+=('nvidia')
- install=nvidia-dkms.install
-
- cd ${_pkg}
- install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
- cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
- echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 250100, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=355.11
+_extramodules=extramodules-4.3-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
+license=('custom')
+options=(!strip)
+source=('nvidia-4.3-build.patch')
+source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+md5sums=('1e5f60cf8e77af482345549b9436887a')
+md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
+md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
+
+ cp -a kernel kernel-dkms
+ cd kernel-dkms
+ sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+ sed -i 's/__JOBS/`nproc`/' dkms.conf
+ sed -i 's/__DKMS_MODULES//' dkms.conf
+ sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+ pkgdesc="NVIDIA drivers for linux"
+ depends=('linux>=4.3' 'linux<4.4' "nvidia-utils=${pkgver}" 'libgl')
+ install=nvidia.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ fi
+
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
+
+package_nvidia-dkms() {
+ pkgdesc="NVIDIA driver sources for linux"
+ depends=('dkms' "nvidia-utils=$pkgver")
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia')
+ install=nvidia-dkms.install
+
+ cd ${_pkg}
+ install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+ cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+ echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}
Deleted: testing-x86_64/nvidia-4.3-build.patch
===================================================================
--- testing-x86_64/nvidia-4.3-build.patch 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-x86_64/nvidia-4.3-build.patch 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,20 +0,0 @@
---- a/kernel/nvidia/nv-procfs.c
-+++ b/kernel/nvidia/nv-procfs.c
-@@ -360,7 +360,8 @@ nv_procfs_read_registry(
- registry_keys = ((nvl != NULL) ?
- nvl->registry_keys : nv_registry_keys);
-
-- return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+ seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+ return 0;
- }
-
- static ssize_t
-@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
- void *v
- )
- {
-- return seq_puts(s, s->private);
-+ seq_puts(s, s->private);
-+ return 0;
- }
Copied: nvidia/repos/testing-x86_64/nvidia-4.3-build.patch (from rev 250100, nvidia/trunk/nvidia-4.3-build.patch)
===================================================================
--- testing-x86_64/nvidia-4.3-build.patch (rev 0)
+++ testing-x86_64/nvidia-4.3-build.patch 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,20 @@
+--- a/kernel/nvidia/nv-procfs.c
++++ b/kernel/nvidia/nv-procfs.c
+@@ -360,7 +360,8 @@ nv_procfs_read_registry(
+ registry_keys = ((nvl != NULL) ?
+ nvl->registry_keys : nv_registry_keys);
+
+- return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++ seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++ return 0;
+ }
+
+ static ssize_t
+@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
+ void *v
+ )
+ {
+- return seq_puts(s, s->private);
++ seq_puts(s, s->private);
++ return 0;
+ }
Deleted: testing-x86_64/nvidia-dkms.install
===================================================================
--- testing-x86_64/nvidia-dkms.install 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-x86_64/nvidia-dkms.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,30 +0,0 @@
-#/bin/sh
-
-# arg 1: the new package version
-post_install() {
- dkms add nvidia/${1%-*}
- cat << EOF
-==> To build and install your modules run: dkms install nvidia/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-pre_upgrade() {
- pre_remove "$2"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install "$1"
-}
-
-# arg 1: the old package version
-pre_remove() {
- # Remove modules using dkms
- [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
\ No newline at end of file
Copied: nvidia/repos/testing-x86_64/nvidia-dkms.install (from rev 250100, nvidia/trunk/nvidia-dkms.install)
===================================================================
--- testing-x86_64/nvidia-dkms.install (rev 0)
+++ testing-x86_64/nvidia-dkms.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add nvidia/${1%-*}
+ cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
\ No newline at end of file
Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install 2015-11-04 14:46:12 UTC (rev 250100)
+++ testing-x86_64/nvidia.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -1,13 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-4.2-ARCH'
- depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 250100, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2015-11-04 14:46:39 UTC (rev 250101)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.3-ARCH'
+ depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list