diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/nvidia-graphics-drivers-565/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch b/nvidia-graphics-drivers-565/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch index 472c379..29a04b4 100644 --- a/nvidia-graphics-drivers-565/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch +++ b/nvidia-graphics-drivers-565/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch @@ -8,14 +8,14 @@ NVIDIA is also planing to enable this as default in the future. Signed-off-by: Peter Jung --- - nvidia-drm/nvidia-drm-linux.c | 4 ++-- - nvidia-drm/nvidia-drm-os-interface.c | 4 ++-- + kernel/nvidia-drm/nvidia-drm-linux.c | 4 ++-- + kernel/nvidia-drm/nvidia-drm-os-interface.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/nvidia-drm/nvidia-drm-linux.c b/nvidia-drm/nvidia-drm-linux.c +diff --git a/kernel/nvidia-drm/nvidia-drm-linux.c b/kernel/nvidia-drm/nvidia-drm-linux.c index 78429510..83d40983 100644 ---- a/nvidia-drm/nvidia-drm-linux.c -+++ b/nvidia-drm/nvidia-drm-linux.c +--- a/kernel/nvidia-drm/nvidia-drm-linux.c ++++ b/kernel/nvidia-drm/nvidia-drm-linux.c @@ -31,13 +31,13 @@ MODULE_PARM_DESC( @@ -32,10 +32,10 @@ index 78429510..83d40983 100644 module_param_named(fbdev, nv_drm_fbdev_module_param, bool, 0400); #endif -diff --git a/nvidia-drm/nvidia-drm-os-interface.c b/nvidia-drm/nvidia-drm-os-interface.c +diff --git a/kernel/nvidia-drm/nvidia-drm-os-interface.c b/kernel/nvidia-drm/nvidia-drm-os-interface.c index 473004b5..75fb34b6 100644 ---- a/nvidia-drm/nvidia-drm-os-interface.c -+++ b/nvidia-drm/nvidia-drm-os-interface.c +--- a/kernel/nvidia-drm/nvidia-drm-os-interface.c ++++ b/kernel/nvidia-drm/nvidia-drm-os-interface.c @@ -41,8 +41,8 @@ #include #endif diff --git a/nvidia-graphics-drivers-565/debian/rules b/nvidia-graphics-drivers-565/debian/rules index 5ad7f3e..84ad565 100644 --- a/nvidia-graphics-drivers-565/debian/rules +++ b/nvidia-graphics-drivers-565/debian/rules @@ -22,48 +22,48 @@ ifeq (amd64,$(DEB_HOST_ARCH)) # This avoids various issue, when Simplefb is used # https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/issues/14 # https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch - patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel/nvidia-drm - patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel-open/nvidia-drm + patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel/nvidia-drm + patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel-open/nvidia-drm # Dont error, when Zen5 CPU is in the system - patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel/nvidia - patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel-open/nvidia + patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel/nvidia + patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel-open/nvidia # Fix for https://bugs.archlinux.org/task/74886 - patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel-open # Patch by Nvidia to silence error messages until a real fix drops in 570.xx # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/716#issuecomment-2391898884 - patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel-open # Patch by Nvidia to fix HDMI names which are otherwise broken in the /proc/asound/NVidia/* ELD files # Should hopefully ship with 570.xx # https://github.com/NVIDIA/open-gpu-kernel-modules/pull/715 - patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel-open # Fix build errors on 6.13+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel-open # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel-open # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel-open # Fixes fbdev on 6.13+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel-open - patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel-open # NVENC/NvFBC sed -i 's/\xe8\x35\x3e\xfe\xff\x85\xc0\x41\x89\xc4/\xe8\x35\x3e\xfe\xff\x29\xc0\x41\x89\xc4/g' "debian/tmp/libnvidia-encode.so.565.77" @@ -82,48 +82,48 @@ ifeq (i386,$(DEB_HOST_ARCH)) # This avoids various issue, when Simplefb is used # https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/issues/14 # https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch - patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel/nvidia-drm - patch -Np1 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d debian/tmp/kernel-open/nvidia-drm + patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel/nvidia-drm + patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel-open/nvidia-drm # Dont error, when Zen5 CPU is in the system - patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel/nvidia - patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d debian/tmp/kernel-open/nvidia + patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel/nvidia + patch -Np2 -i $(CURDIR)/debian/patches/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch -d $(CURDIR)/debian/tmp/kernel-open/nvidia # Fix for https://bugs.archlinux.org/task/74886 - patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0003-Add-IBT-support.patch -d $(CURDIR)/debian/tmp/kernel-open # Patch by Nvidia to silence error messages until a real fix drops in 570.xx # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/716#issuecomment-2391898884 - patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0004-silence-event-assert-until-570.patch -d $(CURDIR)/debian/tmp/kernel-open # Patch by Nvidia to fix HDMI names which are otherwise broken in the /proc/asound/NVidia/* ELD files # Should hopefully ship with 570.xx # https://github.com/NVIDIA/open-gpu-kernel-modules/pull/715 - patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0005-nvkms-Sanitize-trim-ELD-product-name-strings.patch -d $(CURDIR)/debian/tmp/kernel-open # Fix build errors on 6.13+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel-open # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel-open # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel-open # Fixes fbdev on 6.13+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d debian/tmp/kernel-open - patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel-open + patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel + patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel-open # Replace libs with 32 bit rm -rf debian/tmp/*.so*