diff -Nru linux-restricted-modules-oem-5.14-5.14.0/debian/changelog linux-restricted-modules-oem-5.14-5.14.0/debian/changelog --- linux-restricted-modules-oem-5.14-5.14.0/debian/changelog 2022-05-19 04:58:22.000000000 +0000 +++ linux-restricted-modules-oem-5.14-5.14.0/debian/changelog 2022-05-25 11:52:41.000000000 +0000 @@ -1,3 +1,24 @@ +linux-restricted-modules-oem-5.14 (5.14.0-1040.44) focal; urgency=medium + + * Master version: 5.14.0-1040.44 + + * Packaging resync (LP: #1786013) + - debian/dkms-versions -- update from kernel-versions (main/2022.05.09) + + -- Thadeu Lima de Souza Cascardo Wed, 25 May 2022 08:52:41 -0300 + +linux-restricted-modules-oem-5.14 (5.14.0-1039.43) focal; urgency=medium + + * Master version: 5.14.0-1039.43 + + * Packaging resync (LP: #1786013) + - [Packaging] resync dkms-build and family + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Timo Aaltonen Mon, 23 May 2022 14:30:40 +0300 + linux-restricted-modules-oem-5.14 (5.14.0-1038.42) focal; urgency=medium * Master version: 5.14.0-1038.42 diff -Nru linux-restricted-modules-oem-5.14-5.14.0/debian/control linux-restricted-modules-oem-5.14-5.14.0/debian/control --- linux-restricted-modules-oem-5.14-5.14.0/debian/control 2022-05-19 04:58:22.000000000 +0000 +++ linux-restricted-modules-oem-5.14-5.14.0/debian/control 2022-05-25 11:52:41.000000000 +0000 @@ -9,7 +9,7 @@ curl, dkms, gawk, - linux-headers-5.14.0-1038-oem (>= 5.14.0-1038.42) [amd64], + linux-headers-5.14.0-1040-oem (>= 5.14.0-1040.44) [amd64], lsb-release, python3, python3-apt, @@ -23,7 +23,7 @@ Provides: ${dkms:nvidia-470-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-470-5.14.0-1038-oem (= ${binary:Version}), + linux-modules-nvidia-470-5.14.0-1040-oem (= ${binary:Version}), ${nvk:nvidia-470}, Description: Extra drivers for nvidia-470 for the oem-20.04 flavour Install extra signed nvidia-470 modules compatible with the oem-20.04 flavour. @@ -35,7 +35,7 @@ Provides: ${dkms:nvidia-510-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-510-5.14.0-1038-oem (= ${binary:Version}), + linux-modules-nvidia-510-5.14.0-1040-oem (= ${binary:Version}), ${nvk:nvidia-510}, Description: Extra drivers for nvidia-510 for the oem-20.04 flavour Install extra signed nvidia-510 modules compatible with the oem-20.04 flavour. @@ -47,7 +47,7 @@ Provides: ${dkms:nvidia-470-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-470-5.14.0-1038-oem (= ${binary:Version}), + linux-modules-nvidia-470-5.14.0-1040-oem (= ${binary:Version}), ${nvk:nvidia-470}, Description: Extra drivers for nvidia-470 for the oem-20.04d flavour Install extra signed nvidia-470 modules compatible with the oem-20.04d flavour. @@ -59,7 +59,7 @@ Provides: ${dkms:nvidia-510-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-510-5.14.0-1038-oem (= ${binary:Version}), + linux-modules-nvidia-510-5.14.0-1040-oem (= ${binary:Version}), ${nvk:nvidia-510}, Description: Extra drivers for nvidia-510 for the oem-20.04d flavour Install extra signed nvidia-510 modules compatible with the oem-20.04d flavour. @@ -274,7 +274,7 @@ Description: Extra drivers for nvidia-510-oem-20.04c (dummy transitional package) Transitional package for upgrades of 510-oem-20.04c to 510-oem-20.04d. -Package: linux-objects-nvidia-470-5.14.0-1038-oem +Package: linux-objects-nvidia-470-5.14.0-1040-oem Build-Profiles: Architecture: amd64 Section: kernel @@ -284,15 +284,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.14.0-1038 (objects) - This package contains the Linux kernel nvidia modules for version 5.14.0-1038. +Description: Linux kernel nvidia modules for version 5.14.0-1040 (objects) + This package contains the Linux kernel nvidia modules for version 5.14.0-1040. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-oem* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-470-5.14.0-1038-oem +Package: linux-modules-nvidia-470-5.14.0-1040-oem Build-Profiles: Architecture: amd64 Section: kernel @@ -301,20 +301,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.14.0-1038-oem | linux-image-unsigned-5.14.0-1038-oem, - linux-signatures-nvidia-5.14.0-1038-oem (= 5.14.0-1038.42), - linux-objects-nvidia-470-5.14.0-1038-oem (= ${binary:Version}), + linux-image-5.14.0-1040-oem | linux-image-unsigned-5.14.0-1040-oem, + linux-signatures-nvidia-5.14.0-1040-oem (= 5.14.0-1040.44), + linux-objects-nvidia-470-5.14.0-1040-oem (= ${binary:Version}), ${nvk:nvidia-470}, -Description: Linux kernel nvidia modules for version 5.14.0-1038 +Description: Linux kernel nvidia modules for version 5.14.0-1040 This package pulls together the Linux kernel nvidia modules for - version 5.14.0-1038 with the appropriate signatures. + version 5.14.0-1040 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-oem* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-510-5.14.0-1038-oem +Package: linux-objects-nvidia-510-5.14.0-1040-oem Build-Profiles: Architecture: amd64 Section: kernel @@ -324,15 +324,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.14.0-1038 (objects) - This package contains the Linux kernel nvidia modules for version 5.14.0-1038. +Description: Linux kernel nvidia modules for version 5.14.0-1040 (objects) + This package contains the Linux kernel nvidia modules for version 5.14.0-1040. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-510-oem* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-510-5.14.0-1038-oem +Package: linux-modules-nvidia-510-5.14.0-1040-oem Build-Profiles: Architecture: amd64 Section: kernel @@ -341,13 +341,13 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.14.0-1038-oem | linux-image-unsigned-5.14.0-1038-oem, - linux-signatures-nvidia-5.14.0-1038-oem (= 5.14.0-1038.42), - linux-objects-nvidia-510-5.14.0-1038-oem (= ${binary:Version}), + linux-image-5.14.0-1040-oem | linux-image-unsigned-5.14.0-1040-oem, + linux-signatures-nvidia-5.14.0-1040-oem (= 5.14.0-1040.44), + linux-objects-nvidia-510-5.14.0-1040-oem (= ${binary:Version}), ${nvk:nvidia-510}, -Description: Linux kernel nvidia modules for version 5.14.0-1038 +Description: Linux kernel nvidia modules for version 5.14.0-1040 This package pulls together the Linux kernel nvidia modules for - version 5.14.0-1038 with the appropriate signatures. + version 5.14.0-1040 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-510-oem* meta-packages, diff -Nru linux-restricted-modules-oem-5.14-5.14.0/debian/dkms-versions linux-restricted-modules-oem-5.14-5.14.0/debian/dkms-versions --- linux-restricted-modules-oem-5.14-5.14.0/debian/dkms-versions 2022-05-19 04:58:22.000000000 +0000 +++ linux-restricted-modules-oem-5.14-5.14.0/debian/dkms-versions 2022-05-25 11:52:40.000000000 +0000 @@ -4,4 +4,4 @@ nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 arch=amd64 nvidia-graphics-drivers-450-server 450.191.01-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server nvidia-graphics-drivers-470-server 470.129.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server -nvidia-graphics-drivers-510-server 510.73.05-0ubuntu0.20.04.1 arch=amd64 +nvidia-graphics-drivers-510-server 510.73.08-0ubuntu0.20.04.1 arch=amd64 diff -Nru linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build --- linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build 2022-05-18 14:43:06.000000000 +0000 +++ linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build 2022-05-23 12:38:02.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e dkms_dir="$1" @@ -116,7 +116,7 @@ continue fi echo "II: dkms-build-configure $(basename "$dkms_config") found, executing" - $SHELL "$dkms_config" \ + "$dkms_config" \ "$srcdir" \ "$dkms_conf" \ "$dkms_dir" \ @@ -159,7 +159,7 @@ # Build the DKMS binaries. echo "II: dkms-build building $package" fakeroot="" -[[ $EUID -ne 0 ]] && fakeroot="/usr/bin/fakeroot" +[ $(id -u) -ne 0 ] && fakeroot="/usr/bin/fakeroot" rc=0 $fakeroot /usr/sbin/dkms build --no-prepare-kernel --no-clean-kernel \ -k "$abi_flavour" \ @@ -243,7 +243,7 @@ continue fi echo "II: dkms-build override $(basename "$dkms_build") found, executing" - $SHELL "$dkms_build" \ + "$dkms_build" \ "$srcdir" \ "$dkms_dir/build/$dkms_package/$dkms_version/objects" \ "$log" \ diff -Nru linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build--nvidia-N linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build--nvidia-N --- linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build--nvidia-N 2022-05-18 14:43:06.000000000 +0000 +++ linux-restricted-modules-oem-5.14-5.14.0/debian/scripts/dkms-build--nvidia-N 2022-05-25 10:19:28.000000000 +0000 @@ -1,4 +1,5 @@ #!/bin/sh +set -e srcdir="$1" objects="$2" diff -Nru linux-restricted-modules-oem-5.14-5.14.0/debian/tracking-bug linux-restricted-modules-oem-5.14-5.14.0/debian/tracking-bug --- linux-restricted-modules-oem-5.14-5.14.0/debian/tracking-bug 2022-05-19 04:56:11.000000000 +0000 +++ linux-restricted-modules-oem-5.14-5.14.0/debian/tracking-bug 2022-05-25 10:19:32.000000000 +0000 @@ -1 +1 @@ -1973981 2022.04.18-9 +1974392 2022.05.09-5