| Message ID | 20220620170940.513445-1-vfazio@xes-inc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] package/nvidia-driver: bump version to 390.151 | expand |
On 20/06/2022 19:09, Vincent Fazio wrote: > Adds support for Linux kernel 5.17. > > Define IGNORE_CC_MISMATCH for kernel module builds to avoid an issue > where NVIDIA's `cc_version_check` in kernel/conftest.sh may falsely > detect a mismatch and fail due to matching on the pkgversion substring > of the GCC version string in the kernel's include/generated/compile.h. Shouldn't that part be done in a separate patch that can be applied to 2022.05.x and 2022.02.x? AFAIU, this error will happen even with the 5.4 kernel that is supported by that version of nvidia-driver. Or doesn't it? Regards, Arnout > > Signed-off-by: Vincent Fazio <vfazio@xes-inc.com> > --- > package/nvidia-driver/nvidia-driver.hash | 4 ++-- > package/nvidia-driver/nvidia-driver.mk | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash > index 7f2248d0f9..6564b8e821 100644 > --- a/package/nvidia-driver/nvidia-driver.hash > +++ b/package/nvidia-driver/nvidia-driver.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 51adb28f0ed4548f35a88a93ad6767ebd807fa14f418bf5e51a6d63a3ff7f275 NVIDIA-Linux-x86-390.132.run > -sha256 b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d NVIDIA-Linux-x86_64-390.132-no-compat32.run > +sha256 5226e4842044cffd9096deadaf68934c133da74e05b80ccd21236584b3afb1fc NVIDIA-Linux-x86-390.151.run > +sha256 6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c NVIDIA-Linux-x86_64-390.151-no-compat32.run > sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE > diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk > index 54c2aa46d8..f1217b00aa 100644 > --- a/package/nvidia-driver/nvidia-driver.mk > +++ b/package/nvidia-driver/nvidia-driver.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NVIDIA_DRIVER_VERSION = 390.132 > +NVIDIA_DRIVER_VERSION = 390.151 > NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) > NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) > NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run > @@ -137,6 +137,7 @@ endif > # 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 = \ > + IGNORE_CC_MISMATCH=1 \ > NV_KERNEL_SOURCES="$(LINUX_DIR)" \ > NV_KERNEL_OUTPUT="$(LINUX_DIR)" \ > NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)"
Arnout, > -----Original Message----- > From: Arnout Vandecappelle <arnout@mind.be> > Sent: Monday, June 20, 2022 1:21 PM > To: Vincent Fazio <vfazio@xes-inc.com>; buildroot@buildroot.org > Cc: Yann E . MORIN <yann.morin.1998@free.fr> > Subject: [External] - Re: [Buildroot] [PATCH 1/1] package/nvidia-driver: bump > version to 390.151 > > > > On 20/06/2022 19:09, Vincent Fazio wrote: > > Adds support for Linux kernel 5.17. > > > > Define IGNORE_CC_MISMATCH for kernel module builds to avoid an issue > > where NVIDIA's `cc_version_check` in kernel/conftest.sh may falsely > > detect a mismatch and fail due to matching on the pkgversion substring > > of the GCC version string in the kernel's include/generated/compile.h. > > Shouldn't that part be done in a separate patch that can be applied to > 2022.05.x and 2022.02.x? AFAIU, this error will happen even with the 5.4 > kernel > that is supported by that version of nvidia-driver. Or doesn't it? You're absolutely correct, I can split this into two patches and resubmit. > > Regards, > Arnout > > > > > Signed-off-by: Vincent Fazio <vfazio@xes-inc.com> > > --- > > package/nvidia-driver/nvidia-driver.hash | 4 ++-- > > package/nvidia-driver/nvidia-driver.mk | 3 ++- > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia- > driver/nvidia-driver.hash > > index 7f2248d0f9..6564b8e821 100644 > > --- a/package/nvidia-driver/nvidia-driver.hash > > +++ b/package/nvidia-driver/nvidia-driver.hash > > @@ -1,4 +1,4 @@ > > # Locally computed > > -sha256 > 51adb28f0ed4548f35a88a93ad6767ebd807fa14f418bf5e51a6d63a3ff7f275 > NVIDIA-Linux-x86-390.132.run > > -sha256 > b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d > NVIDIA-Linux-x86_64-390.132-no-compat32.run > > +sha256 > 5226e4842044cffd9096deadaf68934c133da74e05b80ccd21236584b3afb1fc > NVIDIA-Linux-x86-390.151.run > > +sha256 > 6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c > NVIDIA-Linux-x86_64-390.151-no-compat32.run > > sha256 > bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 > LICENSE > > diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia- > driver/nvidia-driver.mk > > index 54c2aa46d8..f1217b00aa 100644 > > --- a/package/nvidia-driver/nvidia-driver.mk > > +++ b/package/nvidia-driver/nvidia-driver.mk > > @@ -4,7 +4,7 @@ > > # > > > ########################################################## > ###################### > > > > -NVIDIA_DRIVER_VERSION = 390.132 > > +NVIDIA_DRIVER_VERSION = 390.151 > > NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) > > NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux- > x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) > > NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)- > $(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run > > @@ -137,6 +137,7 @@ endif > > # 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 = \ > > + IGNORE_CC_MISMATCH=1 \ > > NV_KERNEL_SOURCES="$(LINUX_DIR)" \ > > NV_KERNEL_OUTPUT="$(LINUX_DIR)" \ > > NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)" > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe.
diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index 7f2248d0f9..6564b8e821 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 51adb28f0ed4548f35a88a93ad6767ebd807fa14f418bf5e51a6d63a3ff7f275 NVIDIA-Linux-x86-390.132.run -sha256 b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d NVIDIA-Linux-x86_64-390.132-no-compat32.run +sha256 5226e4842044cffd9096deadaf68934c133da74e05b80ccd21236584b3afb1fc NVIDIA-Linux-x86-390.151.run +sha256 6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c NVIDIA-Linux-x86_64-390.151-no-compat32.run sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 54c2aa46d8..f1217b00aa 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVIDIA_DRIVER_VERSION = 390.132 +NVIDIA_DRIVER_VERSION = 390.151 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run @@ -137,6 +137,7 @@ endif # 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 = \ + IGNORE_CC_MISMATCH=1 \ NV_KERNEL_SOURCES="$(LINUX_DIR)" \ NV_KERNEL_OUTPUT="$(LINUX_DIR)" \ NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)"
Adds support for Linux kernel 5.17. Define IGNORE_CC_MISMATCH for kernel module builds to avoid an issue where NVIDIA's `cc_version_check` in kernel/conftest.sh may falsely detect a mismatch and fail due to matching on the pkgversion substring of the GCC version string in the kernel's include/generated/compile.h. Signed-off-by: Vincent Fazio <vfazio@xes-inc.com> --- package/nvidia-driver/nvidia-driver.hash | 4 ++-- package/nvidia-driver/nvidia-driver.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)