diff -Nru linux-restricted-signatures-aws-5.11.0/debian/changelog linux-restricted-signatures-aws-5.13.0/debian/changelog --- linux-restricted-signatures-aws-5.11.0/debian/changelog 2021-08-17 13:42:16.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/debian/changelog 2021-10-08 07:20:49.000000000 +0000 @@ -1,9 +1,63 @@ -linux-restricted-signatures-aws (5.11.0-1015.16+21.10.1+1) impish; urgency=medium +linux-restricted-signatures-aws (5.13.0-1005.6) impish; urgency=medium + + * Master version: 5.13.0-1005.6 + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Andrea Righi Fri, 08 Oct 2021 09:20:49 +0200 + +linux-restricted-modules-aws (5.13.0-1004.5) impish; urgency=medium + + * Master version: 5.13.0-1004.5 + + * Packaging resync (LP: #1786013) + - debian/dkms-versions -- update from kernel-versions (main/master) * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Andrea Righi Mon, 27 Sep 2021 13:22:19 +0200 + +linux-restricted-modules-aws (5.13.0-1003.4) impish; urgency=medium + + * Master version: 5.13.0-1003.4 + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Andrea Righi Sat, 18 Sep 2021 11:07:17 +0200 + +linux-restricted-modules-aws (5.13.0-1002.3) impish; urgency=medium + + * Master version: 5.13.0-1002.3 + + * Packaging resync (LP: #1786013) - debian/dkms-versions -- update from kernel-versions (main/master) - -- Andy Whitcroft Tue, 17 Aug 2021 14:42:16 +0100 + * Miscellaneous Ubuntu changes + - [Packaging] switch to kernel-versions + - debian/tracking-bug -- update from master + + -- Andrea Righi Fri, 17 Sep 2021 19:46:57 +0200 + +linux-restricted-modules-aws (5.13.0-1001.2) impish; urgency=medium + + * Master version: 5.13.0-1001.2 + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Tim Gardner Thu, 16 Sep 2021 13:34:04 -0600 + +linux-restricted-modules-aws (5.13.0-1000.1) impish; urgency=medium + + * Master version: 5.13.0-1000.1 + + * Packaging resync (LP: #1786013) + - [Packaging] resync dkms-build and family + + -- Tim Gardner Wed, 04 Aug 2021 12:43:39 -0600 linux-restricted-modules-aws (5.11.0-1015.16+21.10.1) impish; urgency=medium diff -Nru linux-restricted-signatures-aws-5.11.0/debian/control linux-restricted-signatures-aws-5.13.0/debian/control --- linux-restricted-signatures-aws-5.11.0/debian/control 2021-08-17 13:42:16.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/debian/control 2021-10-08 07:20:49.000000000 +0000 @@ -9,22 +9,22 @@ curl, dkms, gawk, - linux-restricted-generate-aws (= 5.11.0-1015.16+21.10.1+1), + linux-restricted-generate-aws (= 5.13.0-1005.6), lsb-release, python3, python3-apt, Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-aws/+git/impish -Package: linux-signatures-nvidia-5.11.0-1015-aws +Package: linux-signatures-nvidia-5.13.0-1005-aws Build-Profiles: Architecture: amd64 Section: kernel Priority: optional -Depends: linux-image-5.11.0-1015-aws | linux-image-unsigned-5.11.0-1015-aws, +Depends: linux-image-5.13.0-1005-aws | linux-image-unsigned-5.13.0-1005-aws, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel signatures for nvidia modules for version 5.11.0-1015-aws +Description: Linux kernel signatures for nvidia modules for version 5.13.0-1005-aws This package contains the Linux kernel signatures nvidia modules for - version 5.11.0-1015-aws. + version 5.13.0-1005-aws. . You likely do not want to install this package directly. diff -Nru linux-restricted-signatures-aws-5.11.0/debian/dkms-versions linux-restricted-signatures-aws-5.13.0/debian/dkms-versions --- linux-restricted-signatures-aws-5.11.0/debian/dkms-versions 2021-08-17 13:41:23.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/debian/dkms-versions 2021-10-08 07:20:49.000000000 +0000 @@ -1,8 +1,7 @@ -zfs-linux 2.0.3-8ubuntu7 -nvidia-graphics-drivers-390 390.144-0ubuntu1 -nvidia-graphics-drivers-460 460.91.03-0ubuntu1 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-435 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-450 -nvidia-graphics-drivers-470 470.63.01-0ubuntu3 transition=nvidia-graphics-drivers-465 -nvidia-graphics-drivers-418-server 418.211.00-0ubuntu1 -nvidia-graphics-drivers-450-server 450.142.00-0ubuntu1 transition=nvidia-graphics-drivers-440-server -nvidia-graphics-drivers-460-server 460.91.03-0ubuntu1 -nvidia-graphics-drivers-470-server 470.57.02-0ubuntu2 +zfs-linux 2.0.3-8ubuntu8 +nvidia-graphics-drivers-390 390.144-0ubuntu2 +nvidia-graphics-drivers-470 470.74-0ubuntu1 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-435 +nvidia-graphics-drivers-418-server 418.211.00-0ubuntu2 +nvidia-graphics-drivers-450-server 450.142.00-0ubuntu2 transition=nvidia-graphics-drivers-440-server +nvidia-graphics-drivers-460-server 460.91.03-0ubuntu2 +nvidia-graphics-drivers-470-server 470.57.02-0ubuntu4 diff -Nru linux-restricted-signatures-aws-5.11.0/debian/scripts/dkms-build linux-restricted-signatures-aws-5.13.0/debian/scripts/dkms-build --- linux-restricted-signatures-aws-5.11.0/debian/scripts/dkms-build 2021-08-17 13:41:01.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/debian/scripts/dkms-build 2021-10-08 06:07:01.000000000 +0000 @@ -158,8 +158,10 @@ # Build the DKMS binaries. echo "II: dkms-build building $package" +fakeroot="" +[[ $EUID -ne 0 ]] && fakeroot="/usr/bin/fakeroot" rc=0 -/usr/sbin/dkms build --no-prepare-kernel --no-clean-kernel \ +$fakeroot /usr/sbin/dkms build --no-prepare-kernel --no-clean-kernel \ -k "$abi_flavour" \ --sourcetree "$dkms_dir/source" \ --dkmstree "$dkms_dir/build" \ diff -Nru linux-restricted-signatures-aws-5.11.0/debian/scripts/dkms-build--nvidia-N linux-restricted-signatures-aws-5.13.0/debian/scripts/dkms-build--nvidia-N --- linux-restricted-signatures-aws-5.11.0/debian/scripts/dkms-build--nvidia-N 2021-08-17 13:41:01.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/debian/scripts/dkms-build--nvidia-N 2021-10-08 06:07:01.000000000 +0000 @@ -50,8 +50,7 @@ # Build helper scripts. cat - <<'EOL' >"$pkgdir/bits/BUILD" -[ "$1" = "unsigned" ] && { signed_only=:; shift; } -[ "$1" = "nocheck" ] && { check_only=:; shift; } +[ "$1" = "unsigned" ] && signed_only=: EOL grep /usr/bin/ld.bfd "$log" | grep -v scripts/genksyms/genksyms | sed -e "s@$build/@@g" >>"$pkgdir/bits/BUILD" sed -e 's/.*-o *\([^ ]*\) .*/rm -f \1/g' <"$pkgdir/bits/BUILD" >"$pkgdir/bits/CLEAN" @@ -62,9 +61,6 @@ ( cd "$pkgdir/bits" || exit 1 - # Add checksum check. - echo "\$check_only sha256sum -c SHA256SUMS || exit 1" >>"$pkgdir/bits/BUILD" - # Add .ko handling to the CLEAN/BUILD dance. for ko in "$pkgdir"/*.ko do @@ -76,7 +72,7 @@ # Clear out anything we are not going to distribute and build unsigned .kos. sh ./CLEAN - sh ./BUILD unsigned nocheck + sh ./BUILD unsigned if [ "$sign" = "--custom" ]; then # We are building for and archive custom signing upload. Keep everything. diff -Nru linux-restricted-signatures-aws-5.11.0/debian/tracking-bug linux-restricted-signatures-aws-5.13.0/debian/tracking-bug --- linux-restricted-signatures-aws-5.11.0/debian/tracking-bug 2021-08-17 13:35:39.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/debian/tracking-bug 2021-10-08 06:52:52.000000000 +0000 @@ -1 +1 @@ -1936480 2021.07.19-1 +1946328 d2021.09.24-3 diff -Nru linux-restricted-signatures-aws-5.11.0/update-dkms-versions linux-restricted-signatures-aws-5.13.0/update-dkms-versions --- linux-restricted-signatures-aws-5.11.0/update-dkms-versions 2021-08-17 13:35:39.000000000 +0000 +++ linux-restricted-signatures-aws-5.13.0/update-dkms-versions 2021-10-08 06:08:24.000000000 +0000 @@ -103,8 +103,14 @@ # Determine if we have this cycle. present=$(cat_file -t "$git_base" 2>/dev/null) if [ "$present" = "" ]; then - echo "$sru_cycle: cycle not found in $remote_repo" 2>&1 - exit 1 + # If we don't have the cycle in the development cycle then + # fall back to master. + case "$sru_cycle" in + d*) git_base="$remote_name/master" ;; + *) echo "$sru_cycle: cycle not found in $remote_repo" 2>&1 + exit 1 + ;; + esac fi # Determine our series and mainline version from our own changelog. @@ -146,7 +152,9 @@ thing="debian/dkms-versions" if ! git diff --exit-code -- "$thing" >/dev/null; then - git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_base)" -s -- "$thing" + git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_base)" \ + -m "BugLink: https://bugs.launchpad.net/bugs/1786013" \ + -s -- "$thing" else echo "$thing: no changes from kernel-versions" fi