diff -Nru linux-restricted-modules-gcp-5.4.0/debian/changelog linux-restricted-modules-gcp-5.4.0/debian/changelog --- linux-restricted-modules-gcp-5.4.0/debian/changelog 2020-12-14 13:14:46.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/changelog 2021-01-06 18:23:20.000000000 +0000 @@ -1,3 +1,16 @@ +linux-restricted-modules-gcp (5.4.0-1034.37) focal; urgency=medium + + * Master version: 5.4.0-1034.37 + + * CVE-2021-1052 // CVE-2021-1053 + - [Packaging] NVIDIA -- Add the 460 driver + - [Packaging] NVIDIA -- Migrate 455 driver to 460 driver + + * Miscellaneous Ubuntu changes + - debian/dkms-versions -- update from master + + -- Thadeu Lima de Souza Cascardo Wed, 06 Jan 2021 15:23:20 -0300 + linux-restricted-modules-gcp (5.4.0-1033.35) focal; urgency=medium * Master version: 5.4.0-1033.35 diff -Nru linux-restricted-modules-gcp-5.4.0/debian/control linux-restricted-modules-gcp-5.4.0/debian/control --- linux-restricted-modules-gcp-5.4.0/debian/control 2020-12-14 13:14:46.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/control 2021-01-06 18:23:20.000000000 +0000 @@ -11,8 +11,8 @@ cpio, dkms, gawk, - linux-headers-5.4.0-1033-gcp (>= 5.4.0-1033.35), - linux-buildinfo-5.4.0-1033-gcp (>= 5.4.0-1033.35), + linux-headers-5.4.0-1034-gcp (>= 5.4.0-1034.37), + linux-buildinfo-5.4.0-1034-gcp (>= 5.4.0-1034.37), Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-gcp/+git/focal @@ -23,35 +23,35 @@ Provides: ${dkms:nvidia-390-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-390-5.4.0-1033-gcp (= ${binary:Version}), + linux-modules-nvidia-390-5.4.0-1034-gcp (= ${binary:Version}), ${nvk:nvidia-390} Description: Extra drivers for nvidia-390 for gcp Install extra signed nvidia-390 modules compatible with gcp -Package: linux-modules-nvidia-455-gcp +Package: linux-modules-nvidia-450-gcp Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-455-5.4.0-1033-gcp (= ${binary:Version}), - ${nvk:nvidia-455} -Description: Extra drivers for nvidia-455 for gcp - Install extra signed nvidia-455 modules compatible with + linux-modules-nvidia-450-5.4.0-1034-gcp (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for gcp + Install extra signed nvidia-450 modules compatible with gcp -Package: linux-modules-nvidia-450-gcp +Package: linux-modules-nvidia-460-gcp Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-460-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-450-5.4.0-1033-gcp (= ${binary:Version}), - ${nvk:nvidia-450} -Description: Extra drivers for nvidia-450 for gcp + linux-modules-nvidia-460-5.4.0-1034-gcp (= ${binary:Version}), + ${nvk:nvidia-460} +Description: Extra drivers for nvidia-460 for gcp Install extra signed nvidia-450 modules compatible with gcp @@ -76,7 +76,14 @@ Description: Extra drivers for nvidia-440 for the gcp flavour (dummy transitional package) Transitional package for upgrades of -440 to -450. -Package: linux-modules-nvidia-390-5.4.0-1033-gcp +Package: linux-modules-nvidia-455-gcp +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-460-gcp +Description: Extra drivers for nvidia-455 for the gcp flavour (dummy transitional package) + Transitional package for upgrades of -455 to -460. + +Package: linux-modules-nvidia-390-5.4.0-1034-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -86,16 +93,16 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, - linux-image-5.4.0-1033-gcp | linux-image-unsigned-5.4.0-1033-gcp, -Description: Linux kernel nvidia modules for version 5.4.0-1033 - This package contains the Linux kernel nvidia modules for version 5.4.0-1033. + linux-image-5.4.0-1034-gcp | linux-image-unsigned-5.4.0-1034-gcp, +Description: Linux kernel nvidia modules for version 5.4.0-1034 + This package contains the Linux kernel nvidia modules for version 5.4.0-1034. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-390-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-455-5.4.0-1033-gcp +Package: linux-modules-nvidia-450-5.4.0-1034-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -105,16 +112,16 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, - linux-image-5.4.0-1033-gcp | linux-image-unsigned-5.4.0-1033-gcp, -Description: Linux kernel nvidia modules for version 5.4.0-1033 - This package contains the Linux kernel nvidia modules for version 5.4.0-1033. + linux-image-5.4.0-1034-gcp | linux-image-unsigned-5.4.0-1034-gcp, +Description: Linux kernel nvidia modules for version 5.4.0-1034 + This package contains the Linux kernel nvidia modules for version 5.4.0-1034. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-455-gcp* meta-packages, + one of the linux-modules-nvidia-450-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-450-5.4.0-1033-gcp +Package: linux-modules-nvidia-460-5.4.0-1034-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -124,12 +131,12 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, - linux-image-5.4.0-1033-gcp | linux-image-unsigned-5.4.0-1033-gcp, -Description: Linux kernel nvidia modules for version 5.4.0-1033 - This package contains the Linux kernel nvidia modules for version 5.4.0-1033. + linux-image-5.4.0-1034-gcp | linux-image-unsigned-5.4.0-1034-gcp, +Description: Linux kernel nvidia modules for version 5.4.0-1034 + This package contains the Linux kernel nvidia modules for version 5.4.0-1034. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-450-gcp* meta-packages, + one of the linux-modules-nvidia-460-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -Nru linux-restricted-modules-gcp-5.4.0/debian/control.d/meta-nvidia linux-restricted-modules-gcp-5.4.0/debian/control.d/meta-nvidia --- linux-restricted-modules-gcp-5.4.0/debian/control.d/meta-nvidia 2020-12-14 13:03:22.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/control.d/meta-nvidia 2021-01-06 18:20:12.000000000 +0000 @@ -11,28 +11,28 @@ Install extra signed nvidia-390 modules compatible with gcp${variant:suffix} -Package: linux-modules-nvidia-455-gcp${variant:suffix} +Package: linux-modules-nvidia-450-gcp${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-455-@ABI@-gcp (= ${binary:Version}), - ${nvk:nvidia-455} -Description: Extra drivers for nvidia-455 for gcp${variant:suffix} - Install extra signed nvidia-455 modules compatible with + linux-modules-nvidia-450-@ABI@-gcp (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for gcp${variant:suffix} + Install extra signed nvidia-450 modules compatible with gcp${variant:suffix} -Package: linux-modules-nvidia-450-gcp${variant:suffix} +Package: linux-modules-nvidia-460-gcp${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-460-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-450-@ABI@-gcp (= ${binary:Version}), - ${nvk:nvidia-450} -Description: Extra drivers for nvidia-450 for gcp${variant:suffix} + linux-modules-nvidia-460-@ABI@-gcp (= ${binary:Version}), + ${nvk:nvidia-460} +Description: Extra drivers for nvidia-460 for gcp${variant:suffix} Install extra signed nvidia-450 modules compatible with gcp${variant:suffix} diff -Nru linux-restricted-modules-gcp-5.4.0/debian/control.d/migrate-nvidia-455 linux-restricted-modules-gcp-5.4.0/debian/control.d/migrate-nvidia-455 --- linux-restricted-modules-gcp-5.4.0/debian/control.d/migrate-nvidia-455 1970-01-01 00:00:00.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/control.d/migrate-nvidia-455 2021-01-06 18:18:51.000000000 +0000 @@ -0,0 +1,6 @@ +Package: linux-modules-nvidia-455-gcp${variant:suffix} +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-460-gcp${variant:suffix} +Description: Extra drivers for nvidia-455 for the gcp flavour (dummy transitional package) + Transitional package for upgrades of -455 to -460. diff -Nru linux-restricted-modules-gcp-5.4.0/debian/control.d/nvidia linux-restricted-modules-gcp-5.4.0/debian/control.d/nvidia --- linux-restricted-modules-gcp-5.4.0/debian/control.d/nvidia 2020-12-14 13:03:22.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/control.d/nvidia 2021-01-06 18:19:25.000000000 +0000 @@ -17,7 +17,7 @@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-455-@ABI@-gcp +Package: linux-modules-nvidia-450-@ABI@-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -32,11 +32,11 @@ This package contains the Linux kernel nvidia modules for version @ABI@. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-455-gcp* meta-packages, + one of the linux-modules-nvidia-450-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-450-@ABI@-gcp +Package: linux-modules-nvidia-460-@ABI@-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -51,6 +51,6 @@ This package contains the Linux kernel nvidia modules for version @ABI@. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-450-gcp* meta-packages, + one of the linux-modules-nvidia-460-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -Nru linux-restricted-modules-gcp-5.4.0/debian/dkms-versions linux-restricted-modules-gcp-5.4.0/debian/dkms-versions --- linux-restricted-modules-gcp-5.4.0/debian/dkms-versions 2020-12-14 13:05:20.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/dkms-versions 2021-01-06 17:35:14.000000000 +0000 @@ -1,8 +1,9 @@ zfs-linux 0.8.3-1ubuntu12.5 -nvidia-graphics-drivers-390 390.138-0ubuntu0.20.04.1 +nvidia-graphics-drivers-390 390.141-0ubuntu0~0.20.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu7 -nvidia-graphics-drivers-450 450.80.02-0ubuntu0.20.04.2 +nvidia-graphics-drivers-450 450.102.04-0ubuntu0~0.20.04.1 nvidia-graphics-drivers-455 455.45.01-0ubuntu0.20.04.1 +nvidia-graphics-drivers-460 460.32.03-0ubuntu0~0.20.04.0.1 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.20.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.20.04.1 nvidia-graphics-drivers-450-server 450.80.02-0ubuntu0.20.04.3 diff -Nru linux-restricted-modules-gcp-5.4.0/debian/rules linux-restricted-modules-gcp-5.4.0/debian/rules --- linux-restricted-modules-gcp-5.4.0/debian/rules 2020-12-14 13:03:22.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/rules 2021-01-06 18:18:15.000000000 +0000 @@ -14,12 +14,12 @@ src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions) -dkms_nvidia_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { print $$2; }' debian/dkms-versions) dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_460_version=$(shell gawk '/^nvidia-graphics-drivers-460 / { print $$2; }' debian/dkms-versions) nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1) -nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1) nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) +nvidia_460_upstream_version=$(shell echo "$(dkms_nvidia_460_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -134,16 +134,16 @@ $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-390-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-390-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_390_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_390_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-390-$(src_abi)-$*,$*,nvidia,390,postinst postrm prerm config templates) - install -d debian/linux-modules-nvidia-455-$(src_abi)-$* - install -d debian/linux-modules-nvidia-455-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-455-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-455-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-455, pool/restricted/n/nvidia-graphics-drivers-455/nvidia-kernel-source-455_$(dkms_nvidia_455_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-455/nvidia-dkms-455_$(dkms_nvidia_455_version)_$(arch).deb) - $(call install_control,linux-modules-nvidia-455-$(src_abi)-$*,$*,nvidia,455,postinst postrm prerm config templates) - install -d debian/linux-modules-nvidia-450-$(src_abi)-$* install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-450, pool/restricted/n/nvidia-graphics-drivers-450/nvidia-kernel-source-450_$(dkms_nvidia_450_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450/nvidia-dkms-450_$(dkms_nvidia_450_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-450-$(src_abi)-$*,$*,nvidia,450,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-460-$(src_abi)-$* + install -d debian/linux-modules-nvidia-460-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-460-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-460-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-460, pool/restricted/n/nvidia-graphics-drivers-460/nvidia-kernel-source-460_$(dkms_nvidia_460_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-460/nvidia-dkms-460_$(dkms_nvidia_460_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-460-$(src_abi)-$*,$*,nvidia,460,postinst postrm prerm config templates) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers @@ -156,12 +156,12 @@ gencontrol_flags := gencontrol_flags += -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))" -gencontrol_flags += -Vdkms:nvidia-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_version))" gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" +gencontrol_flags += -Vdkms:nvidia-460-modules="nvidia-dkms-460 (= $(dkms_nvidia_460_version))" gencontrol_flags += -Vnvk:nvidia-390="nvidia-kernel-common-390 (<= $(nvidia_390_upstream_version)-1), nvidia-kernel-common-390 (>= $(nvidia_390_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))" gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-460="nvidia-kernel-common-460 (<= $(nvidia_460_upstream_version)-1), nvidia-kernel-common-460 (>= $(nvidia_460_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags)