[arch-commits] Commit in nvidia-390xx/repos/testing-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Thu Nov 1 11:12:44 UTC 2018
Date: Thursday, November 1, 2018 @ 11:12:44
Author: heftig
Revision: 337675
archrelease: copy trunk to testing-x86_64
Added:
nvidia-390xx/repos/testing-x86_64/PKGBUILD
(from rev 337674, nvidia-390xx/trunk/PKGBUILD)
nvidia-390xx/repos/testing-x86_64/kernel-4.16.patch
(from rev 337674, nvidia-390xx/trunk/kernel-4.16.patch)
nvidia-390xx/repos/testing-x86_64/kernel-4.19.patch
(from rev 337674, nvidia-390xx/trunk/kernel-4.19.patch)
Deleted:
nvidia-390xx/repos/testing-x86_64/PKGBUILD
nvidia-390xx/repos/testing-x86_64/kernel-4.16.patch
nvidia-390xx/repos/testing-x86_64/kernel-4.19.patch
-------------------+
PKGBUILD | 182 ++++++++++++++++++++++++++--------------------------
kernel-4.16.patch | 66 +++++++++---------
kernel-4.19.patch | 124 ++++++++++++++++++-----------------
3 files changed, 187 insertions(+), 185 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-01 11:12:30 UTC (rev 337674)
+++ PKGBUILD 2018-11-01 11:12:44 UTC (rev 337675)
@@ -1,91 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia-390xx
-pkgname=(nvidia-390xx nvidia-390xx-dkms)
-pkgver=390.87
-_extramodules=extramodules-ARCH
-pkgrel=9
-pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
-arch=('x86_64')
-url="http://www.nvidia.com/"
-makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 'linux-headers<4.20')
-conflicts=('nvidia')
-license=('custom')
-options=('!strip')
-_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
- kernel-4.16.patch kernel-4.19.patch)
-sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66'
- '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
- '97b392ce8a193ee64d3a3d0655936a02c5d7623730b69e5119664d01c3df8392')
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
-
- # Restore phys_to_dma support (still needed for 396.18)
- # https://bugs.archlinux.org/task/58074
- patch -Np1 -i ../kernel-4.16.patch
-
- # Ad-hoc patch
- patch -Np1 -i ../kernel-4.19.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"\
-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() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia-390xx() {
- pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
- depends=('linux>=4.19' 'linux<4.20' "nvidia-390xx-utils=${pkgver}" 'libglvnd')
-
- install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
- "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
- find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
- install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
-}
-
-package_nvidia-390xx-dkms() {
- pkgdesc="NVIDIA driver sources for linux, 390xx legacy branch"
- depends=('dkms' "nvidia-390xx-utils=$pkgver" 'libglvnd')
- optdepends=('linux-headers: Build the module for Arch kernel'
- 'linux-lts-headers: Build the module for LTS Arch kernel')
- provides=("nvidia-390xx=$pkgver")
- conflicts+=('nvidia-390xx')
-
- cd ${_pkg}
-
- install -dm 755 "${pkgdir}"/usr/src
- cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
-
- echo "blacklist nouveau" |
- install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
- install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
-}
Copied: nvidia-390xx/repos/testing-x86_64/PKGBUILD (from rev 337674, nvidia-390xx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-01 11:12:44 UTC (rev 337675)
@@ -0,0 +1,91 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-390xx
+pkgname=(nvidia-390xx nvidia-390xx-dkms)
+pkgver=390.87
+_extramodules=extramodules-ARCH
+pkgrel=10
+pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/"
+makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
+ kernel-4.16.patch kernel-4.19.patch)
+sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66'
+ '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
+ 'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431')
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+
+ # Restore phys_to_dma support (still needed for 396.18)
+ # https://bugs.archlinux.org/task/58074
+ patch -Np1 -i ../kernel-4.16.patch
+
+ # Ad-hoc patch
+ patch -Np1 -i ../kernel-4.19.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"\
+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() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-390xx() {
+ pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
+ depends=('linux>=4.19' 'linux<4.20' "nvidia-390xx-utils=${pkgver}" 'libglvnd')
+
+ install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+ "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+ install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-390xx-dkms() {
+ pkgdesc="NVIDIA driver sources for linux, 390xx legacy branch"
+ depends=('dkms' "nvidia-390xx-utils=$pkgver" 'libglvnd')
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ provides=("nvidia-390xx=$pkgver")
+ conflicts+=('nvidia-390xx')
+
+ cd ${_pkg}
+
+ install -dm 755 "${pkgdir}"/usr/src
+ cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+
+ echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+ install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
+}
Deleted: kernel-4.16.patch
===================================================================
--- kernel-4.16.patch 2018-11-01 11:12:30 UTC (rev 337674)
+++ kernel-4.16.patch 2018-11-01 11:12:44 UTC (rev 337675)
@@ -1,33 +0,0 @@
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 10fc418..22ef968 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
-
- #if defined(NV_VM_INSERT_PAGE_PRESENT)
- #include <linux/pagemap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+#include <linux/dma-direct.h>
-+#endif
- #endif
-
- #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b23dbb4..42dc576 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1906,7 +1906,12 @@ compile_test() {
- # Determine if the phys_to_dma function is present.
- #
- CODE="
-+ #include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+ #include <linux/dma-direct.h>
-+#endif
- void conftest_phys_to_dma(void) {
- phys_to_dma();
- }"
Copied: nvidia-390xx/repos/testing-x86_64/kernel-4.16.patch (from rev 337674, nvidia-390xx/trunk/kernel-4.16.patch)
===================================================================
--- kernel-4.16.patch (rev 0)
+++ kernel-4.16.patch 2018-11-01 11:12:44 UTC (rev 337675)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include <linux/pagemap.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include <linux/dma-mapping.h>
++#else
++#include <linux/dma-direct.h>
++#endif
+ #endif
+
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include <linux/dma-mapping.h>
++#else
++ #include <linux/dma-direct.h>
++#endif
+ void conftest_phys_to_dma(void) {
+ phys_to_dma();
+ }"
Deleted: kernel-4.19.patch
===================================================================
--- kernel-4.19.patch 2018-11-01 11:12:30 UTC (rev 337674)
+++ kernel-4.19.patch 2018-11-01 11:12:44 UTC (rev 337675)
@@ -1,61 +0,0 @@
-diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh
---- a/kernel/conftest.sh 2018-10-26 21:12:23.587468332 +0200
-+++ b/kernel/conftest.sh 2018-10-26 21:15:22.541274337 +0200
-@@ -2363,17 +2363,17 @@
-
- ;;
-
-- drm_mode_connector_list_update_has_merge_type_bits_arg)
-+ drm_connector_list_update_has_merge_type_bits_arg)
- #
-- # Detect if drm_mode_connector_list_update() has a
-+ # Detect if drm_connector_list_update() has a
- # 'merge_type_bits' second argument. This argument was
- # remove by:
- # 2015-12-03 6af3e6561243f167dabc03f732d27ff5365cd4a4
- #
- CODE="
- #include <drm/drmP.h>
-- void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) {
-- drm_mode_connector_list_update(
-+ void conftest_drm_connector_list_update_has_merge_type_bits_arg(void) {
-+ drm_connector_list_update(
- NULL, /* struct drm_connector *connector */
- true); /* bool merge_type_bits */
- }"
-diff -u -r a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-08-22 02:55:29.000000000 +0200
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-10-26 21:14:14.891095557 +0200
-@@ -226,7 +226,7 @@
-
-
- if (nv_connector->edid != NULL) {
-- drm_mode_connector_update_edid_property(
-+ drm_connector_update_edid_property(
- connector, nv_connector->edid);
- }
-
-diff -u -r a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-08-22 02:55:29.000000000 +0200
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-10-26 21:13:46.644354274 +0200
-@@ -216,7 +216,7 @@
-
- /* Attach encoder and connector */
-
-- ret = drm_mode_connector_attach_encoder(connector, encoder);
-+ ret = drm_connector_attach_encoder(connector, encoder);
-
- if (ret != 0) {
- NV_DRM_DEV_LOG_ERR(
-diff -u -r a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
---- a/kernel/nvidia-drm/nvidia-drm.Kbuild 2018-08-21 23:45:43.000000000 +0200
-+++ b/kernel/nvidia-drm/nvidia-drm.Kbuild 2018-10-26 21:15:39.911320257 +0200
-@@ -74,7 +74,7 @@
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_set_busid
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_state_has_connectors_changed
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_init_function_args
--NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_connector_list_update_has_merge_type_bits_arg
-+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_connector_list_update_has_merge_type_bits_arg
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_helper_mode_fill_fb_struct
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_master_drop_has_from_release_arg
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_unload_has_int_return_type
Copied: nvidia-390xx/repos/testing-x86_64/kernel-4.19.patch (from rev 337674, nvidia-390xx/trunk/kernel-4.19.patch)
===================================================================
--- kernel-4.19.patch (rev 0)
+++ kernel-4.19.patch 2018-11-01 11:12:44 UTC (rev 337675)
@@ -0,0 +1,63 @@
+diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh
+--- a/kernel/conftest.sh 2018-11-01 11:00:14.429126159 +0000
++++ b/kernel/conftest.sh 2018-11-01 11:03:08.199579458 +0000
+@@ -2372,8 +2372,13 @@
+ #
+ CODE="
+ #include <drm/drmP.h>
++ #include <linux/version.h>
+ void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) {
++ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ drm_mode_connector_list_update(
++ #else
++ drm_connector_list_update(
++ #endif
+ NULL, /* struct drm_connector *connector */
+ true); /* bool merge_type_bits */
+ }"
+diff -u -r a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-08-22 00:55:29.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-01 11:08:14.643715031 +0000
+@@ -34,6 +34,7 @@
+
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+
+ static void nv_drm_connector_destroy(struct drm_connector *connector)
+ {
+@@ -226,7 +227,11 @@
+
+
+ if (nv_connector->edid != NULL) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ drm_mode_connector_update_edid_property(
++#else
++ drm_connector_update_edid_property(
++#endif
+ connector, nv_connector->edid);
+ }
+
+diff -u -r a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-08-22 00:55:29.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-01 11:08:32.210427737 +0000
+@@ -34,6 +34,7 @@
+
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+
+ static void nv_drm_encoder_destroy(struct drm_encoder *encoder)
+ {
+@@ -216,7 +217,11 @@
+
+ /* Attach encoder and connector */
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ ret = drm_mode_connector_attach_encoder(connector, encoder);
++#else
++ ret = drm_connector_attach_encoder(connector, encoder);
++#endif
+
+ if (ret != 0) {
+ NV_DRM_DEV_LOG_ERR(
More information about the arch-commits
mailing list