#
################################################################################
-NVIDIA_DRIVER_VERSION = 358.16
+NVIDIA_DRIVER_VERSION = 367.35
NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run
# are build dependencies of packages that depend on nvidia-driver, so
# they should be built prior to those packages, and the only simple
# way to do so is to make nvidia-driver depend on them.
-NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers xlib_libX11 xlib_libXext
+NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers
NVIDIA_DRIVER_PROVIDES = libgl libegl libgles
-# We have two variables that contains a list of libraries to install:
-# NVIDIA_DRIVER_LIBS
-# contains the libraries whose filename end up in .so.$(VERSION); rather
-# than duplicate the version string for all of them, we just store their
-# basename, and append the version string below.
-# NVIDIA_DRIVER_LIBS_NO_VERSION
-# contains all libraries the do not use the NVidia version; since there
-# is currently only one such library, we store its full name.
+# libGL.so.$(NVIDIA_DRIVER_VERSION) is the legacy libGL.so library; it
+# has been replaced with libGL.so.1.0.0. Installing both is technically
+# possible, but great care must be taken to ensure they do not conflict,
+# so that EGL still works. The legacy library exposes an NVidia-specific
+# API, so it should not be needed, except for legacy, binary-only
+# applications (in other words: we don't care).
+#
+# libGL.so.1.0.0 is the new vendor-neutral library, aimed at replacing
+# the old libGL.so.$(NVIDIA_DRIVER_VERSION) library. The latter contains
+# NVidia extensions (which is deemed bad now), while the former follows
+# the newly-introduced vendor-neutral "dispatching" API/ABI:
+# https://github.com/aritger/linux-opengl-abi-proposal/blob/master/linux-opengl-abi-proposal.txt
+# However, this is not very usefull to us, as we don't support multiple
+# GL providers at the same time on the system, which this proposal is
+# aimed at supporting.
+#
+# So we only install the legacy library for now.
+NVIDIA_DRIVER_LIBS_GL = \
+ libGLX.so.0 \
+ libGL.so.$(NVIDIA_DRIVER_VERSION) \
+ libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+
+NVIDIA_DRIVER_LIBS_EGL = \
+ libEGL.so.1 \
+ libGLdispatch.so.0 \
+ libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+
+NVIDIA_DRIVER_LIBS_GLES = \
+ libGLESv1_CM.so.1 \
+ libGLESv2.so.2 \
+ libGLESv1_CM_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+ libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+
+NVIDIA_DRIVER_LIBS_MISC = \
+ libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-egl-wayland.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \
+ tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \
+ libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) \
-# Each line corresponds to a specific set of libraries
NVIDIA_DRIVER_LIBS = \
- libEGL libGLESv1_CM libGLESv2 libGL \
- libnvidia-glcore libnvidia-eglcore libnvidia-glsi \
- tls/libnvidia-tls \
- libvdpau libvdpau_nvidia \
- libnvidia-ml
+ $(NVIDIA_DRIVER_LIBS_GL) \
+ $(NVIDIA_DRIVER_LIBS_EGL) \
+ $(NVIDIA_DRIVER_LIBS_GLES) \
+ $(NVIDIA_DRIVER_LIBS_MISC) \
# Install the gl.pc file
define NVIDIA_DRIVER_INSTALL_GL_DEV
# on using those libraries (e.g. if the user has such an agreement, or
# wants to run a third-party program developped under such an agreement).
ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_PRIVATE_LIBS),y)
-NVIDIA_DRIVER_LIBS += libnvidia-ifr libnvidia-fbc
+NVIDIA_DRIVER_LIBS += \
+ libnvidia-ifr.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-fbc.so.$(NVIDIA_DRIVER_VERSION)
endif
# We refer to the destination path; the origin file has no directory component
-NVIDIA_DRIVER_X_MODS = drivers/nvidia_drv.so \
+NVIDIA_DRIVER_X_MODS = \
+ drivers/nvidia_drv.so \
extensions/libglx.so.$(NVIDIA_DRIVER_VERSION) \
libnvidia-wfb.so.$(NVIDIA_DRIVER_VERSION)
endif # X drivers
ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y)
-NVIDIA_DRIVER_LIBS += libcuda libnvidia-compiler libnvcuvid libnvidia-encode
+NVIDIA_DRIVER_LIBS += \
+ libcuda.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-compiler.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvcuvid.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-fatbinaryloader.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-ptxjitcompiler.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-encode.so.$(NVIDIA_DRIVER_VERSION)
ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS),y)
NVIDIA_DRIVER_PROGS = nvidia-cuda-mps-control nvidia-cuda-mps-server
endif
endif
ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_OPENCL),y)
-NVIDIA_DRIVER_LIBS_NO_VERSION += libOpenCL.so.1.0.0
-NVIDIA_DRIVER_LIBS += libnvidia-opencl
+NVIDIA_DRIVER_LIBS += \
+ libOpenCL.so.1.0.0 \
+ libnvidia-opencl.so.$(NVIDIA_DRIVER_VERSION)
+endif
+
+# Build and install the kernel modules if needed
+ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_MODULE),y)
+
+NVIDIA_DRIVER_MODULES = nvidia nvidia-modeset nvidia-drm
+ifeq ($(BR2_x86_64),y)
+NVIDIA_DRIVER_MODULES += nvidia-uvm
endif
+# They can't do everything like everyone. They need those variables,
+# because they don't recognise the usual variables set by the kernel
+# build system. We also need to tell them what modules to build.
+NVIDIA_DRIVER_MODULE_MAKE_OPTS = \
+ NV_KERNEL_SOURCES="$(LINUX_DIR)" \
+ NV_KERNEL_OUTPUT="$(LINUX_DIR)" \
+ NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)"
+
+NVIDIA_DRIVER_MODULE_SUBDIRS = kernel
+
+$(eval $(kernel-module))
+
+endif # BR2_PACKAGE_NVIDIA_DRIVER_MODULE == y
+
# The downloaded archive is in fact an auto-extract script. So, it can run
# virtually everywhere, and it is fine enough to provide useful options.
# Except it can't extract into an existing (even empty) directory.
define NVIDIA_DRIVER_EXTRACT_CMDS
$(SHELL) $(DL_DIR)/$(NVIDIA_DRIVER_SOURCE) --extract-only --target \
$(@D)/tmp-extract
+ chmod u+w -R $(@D)
mv $(@D)/tmp-extract/* $(@D)/tmp-extract/.manifest $(@D)
rm -rf $(@D)/tmp-extract
endef
-# Build and install the kernel modules if needed
-ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_MODULE),y)
-
-NVIDIA_DRIVER_DEPENDENCIES += linux
-
-# NVidia uses the legacy naming scheme for the x86 architecture, when i386
-# and x86_64 were still considered two separate architectures in the Linux
-# kernel.
-NVIDIA_DRIVER_ARCH = $(if $(BR2_i386),i386,$(BR2_ARCH))
-
-NVIDIA_DRIVER_MOD_DIRS = kernel
-NVIDIA_DRIVER_MOD_FILES = kernel/nvidia.ko
-# nvidia-uvm.ko only available for x86_64
-ifeq ($(BR2_x86_64)$(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),yy)
-NVIDIA_DRIVER_MOD_DIRS += kernel/uvm
-NVIDIA_DRIVER_MOD_FILES += kernel/uvm/nvidia-uvm.ko
-endif
-
-# We can not use '$(MAKE) -C $(@D)/$${dir}' because NVidia's uses its own
-# Makefile to build a kernel module, which includes a lot of assumptions
-# on where to find its own sub-Makefile fragments, and fails if make is
-# not run from the directory where the module's source files are. Hence
-# our little trick to cd in there first.
-# That's also the reason why we do not use LINUX_MAKE_FLAGS or the other
-# linux-specific variables, since NVidia's Makefile does not understand
-# them.
-define NVIDIA_DRIVER_BUILD_CMDS
- for dir in $(NVIDIA_DRIVER_MOD_DIRS); do \
- (cd $(@D)/$${dir} && \
- $(MAKE) SYSSRC="$(LINUX_DIR)" SYSOUT="$(LINUX_DIR)" \
- CC="$(TARGET_CC)" LD="$(TARGET_LD)" HOSTCC="$(HOSTCC)" \
- ARCH=$(NVIDIA_DRIVER_ARCH) module) || exit 1; \
- done
-endef
-
-# We do not use module-install because NVidia's Makefile requires root.
-# Also, we do not install it in the expected location (in nvidia/ rather
-# than in kernel/drivers/video/)
-define NVIDIA_DRIVER_INSTALL_KERNEL_MODULE
- for mod in $(NVIDIA_DRIVER_MOD_FILES); do \
- $(INSTALL) -D -m 0644 $(@D)/$${mod} \
- $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/nvidia/$${mod##*/} \
- || exit 1; \
- done
- $(HOST_DIR)/sbin/depmod -a -b $(TARGET_DIR) $(LINUX_VERSION_PROBED)
-endef
-
-endif # BR2_PACKAGE_NVIDIA_DRIVER_MODULE == y
-
# Helper to install libraries
# $1: destination directory (target or staging)
#
-# For all libraries that need it, we append the NVidia version string.
-# Then for all libraries, we install them and create a symlink using
-# their SONAME, so we can link to them at runtime; we also create the
-# no-version symlink, so we can link to them at build time.
+# For all libraries, we install them and create a symlink using
+# their SONAME, so we can link to them at runtime; we also create
+# the no-version symlink, so we can link to them at build time.
define NVIDIA_DRIVER_INSTALL_LIBS
- for libpath in $(addsuffix .so.$(NVIDIA_DRIVER_VERSION),$(NVIDIA_DRIVER_LIBS)) \
- $(NVIDIA_DRIVER_LIBS_NO_VERSION); \
- do \
- libname="$${libpath##*/}"; \
- $(INSTALL) -D -m 0644 $(@D)/$${libpath} $(1)/usr/lib/$${libname}; \
- libsoname="$$( $(TARGET_READELF) -d "$(@D)/$${libpath}" \
+ $(foreach lib,$(NVIDIA_DRIVER_LIBS),\
+ $(INSTALL) -D -m 0644 $(@D)/$(lib) $(1)/usr/lib/$(notdir $(lib))
+ libsoname="$$( $(TARGET_READELF) -d "$(@D)/$(lib)" \
|sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \
- if [ -n "$${libsoname}" -a "$${libsoname}" != "$${libname}" ]; then \
- ln -sf $${libname} $(1)/usr/lib/$${libsoname}; \
- fi; \
- baseso="$${libname/.so*}.so"; \
- if [ -n "$${baseso}" -a "$${baseso}" != "$${libname}" ]; then \
- ln -sf $${libname} $(1)/usr/lib/$${baseso}; \
- fi; \
- done
+ if [ -n "$${libsoname}" -a "$${libsoname}" != "$(notdir $(lib))" ]; then \
+ ln -sf $(notdir $(lib)) \
+ $(1)/usr/lib/$${libsoname}; \
+ fi
+ baseso=$(firstword $(subst .,$(space),$(notdir $(lib)))).so; \
+ if [ -n "$${baseso}" -a "$${baseso}" != "$(notdir $(lib))" ]; then \
+ ln -sf $(notdir $(lib)) $(1)/usr/lib/$${baseso}; \
+ fi
+ )
endef
# For staging, install libraries and development files
# For target, install libraries and X.org modules
define NVIDIA_DRIVER_INSTALL_TARGET_CMDS
$(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR))
- for m in $(NVIDIA_DRIVER_X_MODS); do \
- $(INSTALL) -D -m 0644 $(@D)/$${m##*/} \
- $(TARGET_DIR)/usr/lib/xorg/modules/$${m}; \
- done
- for p in $(NVIDIA_DRIVER_PROGS); do \
- $(INSTALL) -D -m 0755 $(@D)/$${p} \
- $(TARGET_DIR)/usr/bin/$${p}; \
- done
+ $(foreach m,$(NVIDIA_DRIVER_X_MODS), \
+ $(INSTALL) -D -m 0644 $(@D)/$(notdir $(m)) \
+ $(TARGET_DIR)/usr/lib/xorg/modules/$(m)
+ )
+ $(foreach p,$(NVIDIA_DRIVER_PROGS), \
+ $(INSTALL) -D -m 0755 $(@D)/$(p) \
+ $(TARGET_DIR)/usr/bin/$(p)
+ )
$(NVIDIA_DRIVER_INSTALL_KERNEL_MODULE)
endef
projects / buildroot.git / commitdiff