diff -Nru linux-restricted-modules-azure-5.4.0/debian/changelog linux-restricted-modules-azure-5.4.0/debian/changelog --- linux-restricted-modules-azure-5.4.0/debian/changelog 2020-09-03 20:58:46.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/changelog 2020-09-05 01:32:15.000000000 +0000 @@ -1,14 +1,8 @@ -linux-restricted-modules-azure (5.4.0-1024.24) focal; urgency=medium +linux-restricted-modules-azure (5.4.0-1025.25) focal; urgency=medium - * Master version: 5.4.0-1024.24 + * Master version: 5.4.0-1025.25 - * Introduce the new NVIDIA 450-server and the 450 UDA series (LP: #1887674) - - [Packaging] Move to nvidia-450 driver series - - * Miscellaneous Ubuntu changes - - debian/dkms-versions -- update from master - - -- Kelsey Skunberg Thu, 03 Sep 2020 14:58:46 -0600 + -- Kelsey Skunberg Fri, 04 Sep 2020 19:32:15 -0600 linux-restricted-modules-azure (5.4.0-1023.23) focal; urgency=medium diff -Nru linux-restricted-modules-azure-5.4.0/debian/control linux-restricted-modules-azure-5.4.0/debian/control --- linux-restricted-modules-azure-5.4.0/debian/control 2020-09-03 20:58:46.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/control 2020-09-05 01:32:15.000000000 +0000 @@ -11,8 +11,8 @@ dkms, curl, gawk, - linux-headers-5.4.0-1024-azure (>= 5.4.0-1024.24), - linux-buildinfo-5.4.0-1024-azure (>= 5.4.0-1024.24), + linux-headers-5.4.0-1025-azure (>= 5.4.0-1025.25), + linux-buildinfo-5.4.0-1025-azure (>= 5.4.0-1025.25), Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-azure/+git/focal @@ -23,7 +23,7 @@ Provides: ${dkms:nvidia-390-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-390-5.4.0-1024-azure (= ${binary:Version}), + linux-modules-nvidia-390-5.4.0-1025-azure (= ${binary:Version}), ${nvk:nvidia-390} Description: Extra drivers for nvidia-390 for azure Install extra signed nvidia-390 modules compatible with @@ -36,40 +36,33 @@ Provides: ${dkms:nvidia-435-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-435-5.4.0-1024-azure (= ${binary:Version}), + linux-modules-nvidia-435-5.4.0-1025-azure (= ${binary:Version}), ${nvk:nvidia-435} Description: Extra drivers for nvidia-435 for azure Install extra signed nvidia-435 modules compatible with azure -Package: linux-modules-nvidia-450-azure +Package: linux-modules-nvidia-440-azure Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-440-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-450-5.4.0-1024-azure (= ${binary:Version}), - ${nvk:nvidia-450} -Description: Extra drivers for nvidia-450 for azure - Install extra signed nvidia-450 modules compatible with + linux-modules-nvidia-440-5.4.0-1025-azure (= ${binary:Version}), + ${nvk:nvidia-440} +Description: Extra drivers for nvidia-440 for azure + Install extra signed nvidia-440 modules compatible with azure Package: linux-modules-nvidia-430-azure Architecture: amd64 Section: oldlibs -Depends: linux-modules-nvidia-450-azure +Depends: linux-modules-nvidia-440-azure Description: Extra drivers for nvidia-430 for the azure flavour (dummy transitional package) - Transitional package for upgrades of -430 to -450. - -Package: linux-modules-nvidia-440-azure -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-450-azure -Description: Extra drivers for nvidia-440 for the azure flavour (dummy transitional package) - Transitional package for upgrades of -440 to -450. + Transitional package for upgrades of -430 to -440. -Package: linux-modules-nvidia-390-5.4.0-1024-azure +Package: linux-modules-nvidia-390-5.4.0-1025-azure Build-Profiles: Architecture: amd64 Section: kernel @@ -79,17 +72,17 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, - linux-image-5.4.0-1024-azure | linux-image-unsigned-5.4.0-1024-azure, + linux-image-5.4.0-1025-azure | linux-image-unsigned-5.4.0-1025-azure, nvidia-kernel-common-390, -Description: Linux kernel nvidia modules for version 5.4.0-1024 - This package contains the Linux kernel nvidia modules for version 5.4.0-1024. +Description: Linux kernel nvidia modules for version 5.4.0-1025 + This package contains the Linux kernel nvidia modules for version 5.4.0-1025. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-390-azure* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-435-5.4.0-1024-azure +Package: linux-modules-nvidia-435-5.4.0-1025-azure Build-Profiles: Architecture: amd64 Section: kernel @@ -99,17 +92,17 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, - linux-image-5.4.0-1024-azure | linux-image-unsigned-5.4.0-1024-azure, + linux-image-5.4.0-1025-azure | linux-image-unsigned-5.4.0-1025-azure, nvidia-kernel-common-435, -Description: Linux kernel nvidia modules for version 5.4.0-1024 - This package contains the Linux kernel nvidia modules for version 5.4.0-1024. +Description: Linux kernel nvidia modules for version 5.4.0-1025 + This package contains the Linux kernel nvidia modules for version 5.4.0-1025. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-435-azure* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-450-5.4.0-1024-azure +Package: linux-modules-nvidia-440-5.4.0-1025-azure Build-Profiles: Architecture: amd64 Section: kernel @@ -119,13 +112,13 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, - linux-image-5.4.0-1024-azure | linux-image-unsigned-5.4.0-1024-azure, - nvidia-kernel-common-450, -Description: Linux kernel nvidia modules for version 5.4.0-1024 - This package contains the Linux kernel nvidia modules for version 5.4.0-1024. + linux-image-5.4.0-1025-azure | linux-image-unsigned-5.4.0-1025-azure, + nvidia-kernel-common-440, +Description: Linux kernel nvidia modules for version 5.4.0-1025 + This package contains the Linux kernel nvidia modules for version 5.4.0-1025. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-450-azure* meta-packages, + one of the linux-modules-nvidia-440-azure* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -Nru linux-restricted-modules-azure-5.4.0/debian/control.d/meta-nvidia linux-restricted-modules-azure-5.4.0/debian/control.d/meta-nvidia --- linux-restricted-modules-azure-5.4.0/debian/control.d/meta-nvidia 2020-09-03 20:56:17.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/control.d/meta-nvidia 2020-09-05 01:31:57.000000000 +0000 @@ -24,15 +24,15 @@ Install extra signed nvidia-435 modules compatible with azure${variant:suffix} -Package: linux-modules-nvidia-450-azure${variant:suffix} +Package: linux-modules-nvidia-440-azure${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-440-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-450-@ABI@-azure (= ${binary:Version}), - ${nvk:nvidia-450} -Description: Extra drivers for nvidia-450 for azure${variant:suffix} - Install extra signed nvidia-450 modules compatible with + linux-modules-nvidia-440-@ABI@-azure (= ${binary:Version}), + ${nvk:nvidia-440} +Description: Extra drivers for nvidia-440 for azure${variant:suffix} + Install extra signed nvidia-440 modules compatible with azure${variant:suffix} diff -Nru linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-430 linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-430 --- linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-430 2020-09-03 20:56:17.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-430 2020-09-05 01:31:57.000000000 +0000 @@ -1,6 +1,6 @@ Package: linux-modules-nvidia-430-azure Architecture: amd64 Section: oldlibs -Depends: linux-modules-nvidia-450-azure +Depends: linux-modules-nvidia-440-azure Description: Extra drivers for nvidia-430 for the azure flavour (dummy transitional package) - Transitional package for upgrades of -430 to -450. + Transitional package for upgrades of -430 to -440. diff -Nru linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-440 linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-440 --- linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-440 2020-09-03 20:56:17.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/control.d/migrate-nvidia-440 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Package: linux-modules-nvidia-440-azure -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-450-azure -Description: Extra drivers for nvidia-440 for the azure flavour (dummy transitional package) - Transitional package for upgrades of -440 to -450. diff -Nru linux-restricted-modules-azure-5.4.0/debian/control.d/nvidia linux-restricted-modules-azure-5.4.0/debian/control.d/nvidia --- linux-restricted-modules-azure-5.4.0/debian/control.d/nvidia 2020-09-03 20:56:17.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/control.d/nvidia 2020-09-05 01:31:57.000000000 +0000 @@ -38,7 +38,7 @@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-450-@ABI@-azure +Package: linux-modules-nvidia-440-@ABI@-azure Build-Profiles: Architecture: amd64 Section: kernel @@ -49,11 +49,11 @@ ${shlibs:Depends}, binutils, linux-image-@ABI@-azure | linux-image-unsigned-@ABI@-azure, - nvidia-kernel-common-450, + nvidia-kernel-common-440, Description: Linux kernel nvidia modules for version @ABI@ 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-azure* meta-packages, + one of the linux-modules-nvidia-440-azure* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -Nru linux-restricted-modules-azure-5.4.0/debian/dkms-versions linux-restricted-modules-azure-5.4.0/debian/dkms-versions --- linux-restricted-modules-azure-5.4.0/debian/dkms-versions 2020-09-02 17:28:02.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/dkms-versions 2020-09-05 00:52:03.000000000 +0000 @@ -1,9 +1,8 @@ -zfs-linux 0.8.3-1ubuntu12.4 +zfs-linux 0.8.3-1ubuntu12.2 nvidia-graphics-drivers-390 390.138-0ubuntu0.20.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu7 -nvidia-graphics-drivers-450 450.66-0ubuntu0.20.04.1 +nvidia-graphics-drivers-440 440.100-0ubuntu0.20.04.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.51.06-0ubuntu0.20.04.2 virtualbox 6.1.10-dfsg-1~ubuntu1.20.04.1 wireguard-linux-compat 1.0.20200611-1ubuntu1~20.04.1 diff -Nru linux-restricted-modules-azure-5.4.0/debian/rules linux-restricted-modules-azure-5.4.0/debian/rules --- linux-restricted-modules-azure-5.4.0/debian/rules 2020-09-03 20:56:17.000000000 +0000 +++ linux-restricted-modules-azure-5.4.0/debian/rules 2020-09-05 01:31:57.000000000 +0000 @@ -15,11 +15,11 @@ dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions) dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435 / { print $$2; }' debian/dkms-versions) -dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { print $$2; }' debian/dkms-versions) nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1) nvidia_435_upstream_version=$(shell echo "$(dkms_nvidia_435_version)" | cut -d '-' -f 1) -nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) +nvidia_440_upstream_version=$(shell echo "$(dkms_nvidia_440_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -139,10 +139,10 @@ $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-435-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-435-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-435, pool/restricted/n/nvidia-graphics-drivers-435/nvidia-kernel-source-435_$(dkms_nvidia_435_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-435/nvidia-dkms-435_$(dkms_nvidia_435_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-435-$(src_abi)-$*,$*,nvidia,435,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-440-$(src_abi)-$* + install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,postinst postrm prerm config templates) prepare-dkms: mkdir -p $(dkms_dir) @@ -157,11 +157,11 @@ gencontrol_flags := gencontrol_flags += -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))" gencontrol_flags += -Vdkms:nvidia-435-modules="nvidia-dkms-435 (= $(dkms_nvidia_435_version))" -gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" +gencontrol_flags += -Vdkms:nvidia-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_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-435="nvidia-kernel-common-435 (<= $(nvidia_435_upstream_version)-1), nvidia-kernel-common-435 (>= $(nvidia_435_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-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags)