diff mbox series

[1/1] package/nvidia-driver: bump version to 390.144

Message ID 20211104141910.1840914-1-vfazio@xes-inc.com
State Superseded
Headers show
Series [1/1] package/nvidia-driver: bump version to 390.144 | expand

Commit Message

Vincent Fazio Nov. 4, 2021, 2:19 p.m. UTC
Adds support for Linux kernel 5.11.

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(-)

Comments

Thomas Petazzoni Dec. 30, 2021, 4:35 p.m. UTC | #1
Hello Vincent,

On Thu,  4 Nov 2021 09:19:10 -0500
Vincent Fazio <vfazio@xes-inc.com> wrote:

> Adds support for Linux kernel 5.11.
> 
> 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(-)
> 
> diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash
> index 7f2248d0f9..9e6deb0061 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 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74  NVIDIA-Linux-x86-390.144.run
> +sha256 d9b36e51253592d7aeecb9758ebccf30348ab364c88f95aa5ba33c767470949c  NVIDIA-Linux-x86_64-390.144-no-compat32.run
>  sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526  LICENSE

Sorry for the slow feedback, but could you check those hashes? Indeed,
I don't get the same here:

ERROR: NVIDIA-Linux-x86-390.144.run has wrong sha256 hash:
ERROR: expected: 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
ERROR: got     : fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

However, *before* doing a test, please keep aside your existing
NVIDIA-Linux-x86-390.144.run and
NVIDIA-Linux-x86_64-390.144-no-compat32.run from your download folder,
and verify their hashes. We indeed want to see if you got the hashes
wrong in the .hash file, or if really NVidia changed the files they are
serving.

Thanks a lot!

Thomas
Vincent Fazio Dec. 30, 2021, 5:20 p.m. UTC | #2
Thomas,


> -----Original Message-----
> From: buildroot <buildroot-bounces@buildroot.org> On Behalf Of Thomas
> Petazzoni
> Sent: Thursday, December 30, 2021 10:35 AM
> To: Vincent Fazio <vfazio@xes-inc.com>
> Cc: Yann E . MORIN <yann.morin.1998@free.fr>; buildroot@buildroot.org
> Subject: [External] - Re: [Buildroot] [PATCH 1/1] package/nvidia-driver: bump
> version to 390.144
> 
> Hello Vincent,
> 
> On Thu,  4 Nov 2021 09:19:10 -0500
> Vincent Fazio <vfazio@xes-inc.com> wrote:
> 
> > Adds support for Linux kernel 5.11.
> >
> > 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(-)
> >
> > diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-
> driver/nvidia-driver.hash
> > index 7f2248d0f9..9e6deb0061 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
> 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
> NVIDIA-Linux-x86-390.144.run
> > +sha256
> d9b36e51253592d7aeecb9758ebccf30348ab364c88f95aa5ba33c767470949c
> NVIDIA-Linux-x86_64-390.144-no-compat32.run
> >  sha256
> bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526
> LICENSE
> 
> Sorry for the slow feedback, but could you check those hashes? Indeed,
> I don't get the same here:
> 
> ERROR: NVIDIA-Linux-x86-390.144.run has wrong sha256 hash:
> ERROR: expected:
> 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
> ERROR: got     :
> fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
> ERROR: Incomplete download, or man-in-the-middle (MITM) attack
> 
> However, *before* doing a test, please keep aside your existing
> NVIDIA-Linux-x86-390.144.run and
> NVIDIA-Linux-x86_64-390.144-no-compat32.run from your download folder,
> and verify their hashes. We indeed want to see if you got the hashes
> wrong in the .hash file, or if really NVidia changed the files they are
> serving.
> 

My archived downloads show the hashes I had included in the hash file

vfazio@vfazio2 /mnt/development $ find . -name "NVIDIA*144*.run" -exec sha256sum '{}' +;
d9b36e51253592d7aeecb9758ebccf30348ab364c88f95aa5ba33c767470949c  ./buildroot/dl/nvidia-driver/NVIDIA-Linux-x86_64-390.144-no-compat32.run

vfazio@vfazio2 /mnt/development $ find ~/Downloads/ -name "NVIDIA*144*.run" -exec sha256sum '{}' +;
8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74  /home/vfazio/Downloads/NVIDIA-Linux-x86_64-390.144.run

I just manually fetched the packages from https://download.nvidia.com/XFree86/Linux-x86_64/390.144/ on my windows box to rule anything out on my linux box:

PS C:\Users\vfazio> Get-FileHash -InputStream ($wc.OpenRead("https://download.nvidia.com/XFree86/Linux-x86_64/390.144/NVIDIA-Linux-x86_64-390.144-no-compat32.run"))

Algorithm       Hash                                                                   Path
---------       ----                                                                   ----
SHA256          D9B36E51253592D7AEECB9758EBCCF30348AB364C88F95AA5BA33C767470949C


PS C:\Users\vfazio> Get-FileHash -InputStream ($wc.OpenRead("https://download.nvidia.com/XFree86/Linux-x86_64/390.144/NVIDIA-Linux-x86_64-390.144.run"))

Algorithm       Hash                                                                   Path
---------       ----                                                                   ----
SHA256          8BB6E8DE89E8F8325466AF29CF0FA235C988D19137F7FE3EB6BFAE1D5E305E74

Not sure why there's a mismatch. 

The patch probably needs to be bumped to 390.147 anyway as that was recently released.

> Thanks a lot!
> 
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://usg02.safelinks.protection.office365.us/?url=https%3A%2F%2Fbootli
> n.com%2F&amp;data=04%7C01%7C%7C8be2745115fc42b413c108d9cbb2667f
> %7C2925f1cdbdc34a76bb386159e20a17f1%7C0%7C0%7C637764789367091265
> %7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiL
> CJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=s4W%2FW5QJMgD
> ULUdTjEsMaFKJICBjitfTGEXHOL5ZeKs%3D&amp;reserved=0
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
> 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 mbox series

Patch

diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash
index 7f2248d0f9..9e6deb0061 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 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74  NVIDIA-Linux-x86-390.144.run
+sha256 d9b36e51253592d7aeecb9758ebccf30348ab364c88f95aa5ba33c767470949c  NVIDIA-Linux-x86_64-390.144-no-compat32.run
 sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526  LICENSE
diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index 54c2aa46d8..5b229725d0 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.144
 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)"