1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
Description: clean up nvidia-fs dkms.conf
Author: Andreas Beckmann <anbe@debian.org>
--- a/nvidia-cuda/nvidia_fs/usr/src/nvidia-fs/dkms.conf
+++ b/nvidia-cuda/nvidia_fs/usr/src/nvidia-fs/dkms.conf
@@ -21,7 +21,15 @@
# DKMS module name and version
PACKAGE_NAME="nvidia-fs"
#please update when GDS_VERSION is updated
-PACKAGE_VERSION="2.7"
+PACKAGE_VERSION="#MODULE_VERSION#"
+
+# PCIE_SPEED_16_0GT was introduced in 4.17.
+BUILD_EXCLUSIVE_KERNEL_MIN="4.17"
+BUILD_EXCLUSIVE_KERNEL="^(4\.1[7-9]\.|4\.[2-9][0-9]\.|[5-9]\.)"
+
+# Only kernels from 3.10 onwards are supported by the NVIDIA driver.
+# The NVIDIA driver does not support real-time kernels.
+BUILD_EXCLUSIVE_CONFIG="!CONFIG_PREEMPT_RT !CONFIG_PREEMPT_RT_FULL"
kernelver=${kernelver:-$(uname -r)}
kernel_source_dir=${kernel_source_dir:-/lib/modules/$kernelver/build}
@@ -48,15 +56,11 @@ fi
# Module name, source and destination directories, and build command-line
BUILT_MODULE_NAME[0]="nvidia-fs"
DEST_MODULE_LOCATION[0]="/kernel/fs/nvidia-fs/"
-BUILD_DEPENDS[0]="nvidia"
-MAKE[0]="'make' -j32 KVER=${kernelver} IGNORE_CC_MISMATCH='1'"
-REMAKE_INITRD=yes
+BUILD_DEPENDS[0]="nvidia-current"
+MAKE[0]="make KVER=${kernelver} IGNORE_CC_MISMATCH='1'"
# Cleanup command-line
-CLEAN="make clean"
+CLEAN="true"
# Rebuild and autoinstall automatically when dkms_autoinstaller runs for a new kernel
AUTOINSTALL="yes"
-
-#POST_REMOVE=nvidia-fs-dkms.prerm
-#POST_INSTALL=nvidia-fs-dkms.postinst
--- a/nvidia-cuda/nvidia_fs/usr/src/nvidia-fs/Makefile
+++ b/nvidia-cuda/nvidia_fs/usr/src/nvidia-fs/Makefile
@@ -95,16 +95,16 @@ REL_MINOR := $(word 3,$(REL))
all: module
nv_configure:
- @ ./configure $(KVER)
+ ./configure $(KVER)
nv_symbols:
@ echo "Picking NVIDIA driver sources from NVIDIA_SRC_DIR=$(NVIDIA_SRC_DIR). If that does not meet your expectation, you might have a stale driver still around and that might cause problems."
- @ chmod +x ./create_nv.symvers.sh
- @ ./create_nv.symvers.sh
- @ cat nv.symvers >> Module.symvers
+ chmod +x ./create_nv.symvers.sh
+ ./create_nv.symvers.sh $(KVER)
+ cat nv.symvers >> Module.symvers
module: nv_symbols nv_configure
- @ KCPPFLAGS="$(NVFS_MODULE_FLAGS) -DNVFS_BATCH_SUPPORT=y" CONFIG_NVFS_BATCH_SUPPORT=y CONFIG_NVFS_STATS=y $(MAKE) -j4 -C $(KDIR) $(MAKE_PARAMS) M=$$PWD modules
+ KCPPFLAGS="$(NVFS_MODULE_FLAGS) -DNVFS_BATCH_SUPPORT=y" CONFIG_NVFS_BATCH_SUPPORT=y CONFIG_NVFS_STATS=y $(MAKE) -j4 -C $(KDIR) $(MAKE_PARAMS) M=$$PWD modules
install:
[ -d $(DESTDIR)/$(MODULE_DESTDIR) ] || mkdir -p $(DESTDIR)/$(MODULE_DESTDIR)
--- a/nvidia-cuda/nvidia_fs/usr/src/nvidia-fs/configure
+++ b/nvidia-cuda/nvidia_fs/usr/src/nvidia-fs/configure
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
#
|