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 2021-07-17 07:44:45.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/changelog 2021-08-01 19:28:48.000000000 +0000 @@ -1,3 +1,27 @@ +linux-restricted-modules-gcp (5.4.0-1051.55) focal; urgency=medium + + * Master version: 5.4.0-1051.55 + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Khalid Elmously Sun, 01 Aug 2021 15:28:48 -0400 + +linux-restricted-modules-gcp (5.4.0-1050.54) focal; urgency=medium + + * Master version: 5.4.0-1050.54 + + * LRMv5: switch primary version handling to kernel-versions data set + (LP: #1928921) + - [Packaging] convert to v5 autogen form + - [Packaging] convert to v5 autogen form -- git compatibility + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + - debian/dkms-versions -- update from kernel-versions (main/2021.07.19) + + -- Khalid Elmously Mon, 26 Jul 2021 01:27:37 -0400 + linux-restricted-modules-gcp (5.4.0-1049.53+2) focal; urgency=medium * Miscellaneous Ubuntu changes 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 2021-07-17 07:44:45.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/control 2021-08-01 19:28:48.000000000 +0000 @@ -9,7 +9,7 @@ curl, dkms, gawk, - linux-headers-5.4.0-1049-gcp (>= 5.4.0-1049.53) [amd64], + linux-headers-5.4.0-1051-gcp (>= 5.4.0-1051.55) [amd64], lsb-release, python3, python3-apt, @@ -23,7 +23,7 @@ Provides: ${dkms:nvidia-390-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-390-5.4.0-1049-gcp (= ${binary:Version}), + linux-modules-nvidia-390-5.4.0-1051-gcp (= ${binary:Version}), ${nvk:nvidia-390}, Description: Extra drivers for nvidia-390 for the gcp-lts-20.04 flavour Install extra signed nvidia-390 modules compatible with the gcp-lts-20.04 flavour. @@ -35,7 +35,7 @@ Provides: ${dkms:nvidia-460-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-460-5.4.0-1049-gcp (= ${binary:Version}), + linux-modules-nvidia-460-5.4.0-1051-gcp (= ${binary:Version}), ${nvk:nvidia-460}, Description: Extra drivers for nvidia-460 for the gcp-lts-20.04 flavour Install extra signed nvidia-460 modules compatible with the gcp-lts-20.04 flavour. @@ -47,7 +47,7 @@ Provides: ${dkms:nvidia-470-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-470-5.4.0-1049-gcp (= ${binary:Version}), + linux-modules-nvidia-470-5.4.0-1051-gcp (= ${binary:Version}), ${nvk:nvidia-470}, Description: Extra drivers for nvidia-470 for the gcp-lts-20.04 flavour Install extra signed nvidia-470 modules compatible with the gcp-lts-20.04 flavour. @@ -87,7 +87,7 @@ Description: Extra drivers for nvidia-465 for the gcp flavour (dummy transitional package) Transitional package for upgrades of -465 to -470. -Package: linux-objects-nvidia-390-5.4.0-1049-gcp +Package: linux-objects-nvidia-390-5.4.0-1051-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -97,15 +97,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.4.0-1049 (objects) - This package contains the Linux kernel nvidia modules for version 5.4.0-1049. +Description: Linux kernel nvidia modules for version 5.4.0-1051 (objects) + This package contains the Linux kernel nvidia modules for version 5.4.0-1051. . 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-390-5.4.0-1049-gcp +Package: linux-modules-nvidia-390-5.4.0-1051-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -114,20 +114,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.4.0-1049-gcp | linux-image-unsigned-5.4.0-1049-gcp, - linux-signatures-nvidia-5.4.0-1049-gcp (= 5.4.0-1049.53+2), - linux-objects-nvidia-390-5.4.0-1049-gcp (= ${binary:Version}), + linux-image-5.4.0-1051-gcp | linux-image-unsigned-5.4.0-1051-gcp, + linux-signatures-nvidia-5.4.0-1051-gcp (= 5.4.0-1051.55), + linux-objects-nvidia-390-5.4.0-1051-gcp (= ${binary:Version}), ${nvk:nvidia-390}, -Description: Linux kernel nvidia modules for version 5.4.0-1049 +Description: Linux kernel nvidia modules for version 5.4.0-1051 This package pulls together the Linux kernel nvidia modules for - version 5.4.0-1049 with the appropriate signatures. + version 5.4.0-1051 with the appropriate signatures. . 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-objects-nvidia-460-5.4.0-1049-gcp +Package: linux-objects-nvidia-460-5.4.0-1051-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -137,15 +137,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.4.0-1049 (objects) - This package contains the Linux kernel nvidia modules for version 5.4.0-1049. +Description: Linux kernel nvidia modules for version 5.4.0-1051 (objects) + This package contains the Linux kernel nvidia modules for version 5.4.0-1051. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-460-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-460-5.4.0-1049-gcp +Package: linux-modules-nvidia-460-5.4.0-1051-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -154,20 +154,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.4.0-1049-gcp | linux-image-unsigned-5.4.0-1049-gcp, - linux-signatures-nvidia-5.4.0-1049-gcp (= 5.4.0-1049.53+2), - linux-objects-nvidia-460-5.4.0-1049-gcp (= ${binary:Version}), + linux-image-5.4.0-1051-gcp | linux-image-unsigned-5.4.0-1051-gcp, + linux-signatures-nvidia-5.4.0-1051-gcp (= 5.4.0-1051.55), + linux-objects-nvidia-460-5.4.0-1051-gcp (= ${binary:Version}), ${nvk:nvidia-460}, -Description: Linux kernel nvidia modules for version 5.4.0-1049 +Description: Linux kernel nvidia modules for version 5.4.0-1051 This package pulls together the Linux kernel nvidia modules for - version 5.4.0-1049 with the appropriate signatures. + version 5.4.0-1051 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-460-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-470-5.4.0-1049-gcp +Package: linux-objects-nvidia-470-5.4.0-1051-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -177,15 +177,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.4.0-1049 (objects) - This package contains the Linux kernel nvidia modules for version 5.4.0-1049. +Description: Linux kernel nvidia modules for version 5.4.0-1051 (objects) + This package contains the Linux kernel nvidia modules for version 5.4.0-1051. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-gcp* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-470-5.4.0-1049-gcp +Package: linux-modules-nvidia-470-5.4.0-1051-gcp Build-Profiles: Architecture: amd64 Section: kernel @@ -194,13 +194,13 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.4.0-1049-gcp | linux-image-unsigned-5.4.0-1049-gcp, - linux-signatures-nvidia-5.4.0-1049-gcp (= 5.4.0-1049.53+2), - linux-objects-nvidia-470-5.4.0-1049-gcp (= ${binary:Version}), + linux-image-5.4.0-1051-gcp | linux-image-unsigned-5.4.0-1051-gcp, + linux-signatures-nvidia-5.4.0-1051-gcp (= 5.4.0-1051.55), + linux-objects-nvidia-470-5.4.0-1051-gcp (= ${binary:Version}), ${nvk:nvidia-470}, -Description: Linux kernel nvidia modules for version 5.4.0-1049 +Description: Linux kernel nvidia modules for version 5.4.0-1051 This package pulls together the Linux kernel nvidia modules for - version 5.4.0-1049 with the appropriate signatures. + version 5.4.0-1051 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-gcp* meta-packages, 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 2021-07-17 07:44:44.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/dkms-versions 2021-08-01 19:28:48.000000000 +0000 @@ -5,5 +5,6 @@ nvidia-graphics-drivers-418-server 418.211.00-0ubuntu0.20.04.1 nvidia-graphics-drivers-450-server 450.142.00-0ubuntu0.20.04.1 transition=nvidia-graphics-drivers-440-server nvidia-graphics-drivers-460-server 460.91.03-0ubuntu0.20.04.1 +nvidia-graphics-drivers-470-server 470.57.02-0ubuntu0.20.04.2 virtualbox 6.1.16-dfsg-6~ubuntu1.20.04.2 wireguard-linux-compat 1.0.20201112-1~20.04.1 diff -Nru linux-restricted-modules-gcp-5.4.0/debian/tracking-bug linux-restricted-modules-gcp-5.4.0/debian/tracking-bug --- linux-restricted-modules-gcp-5.4.0/debian/tracking-bug 1970-01-01 00:00:00.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/debian/tracking-bug 2021-08-01 19:19:20.000000000 +0000 @@ -0,0 +1 @@ +1938649 2021.07.19-7 diff -Nru linux-restricted-modules-gcp-5.4.0/update-dkms-versions linux-restricted-modules-gcp-5.4.0/update-dkms-versions --- linux-restricted-modules-gcp-5.4.0/update-dkms-versions 1970-01-01 00:00:00.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/update-dkms-versions 2021-07-24 07:55:59.000000000 +0000 @@ -0,0 +1,154 @@ +#!/bin/bash + +remote_repo='' +sru_cycle= +while : +do + if [ "$1" = "--remote-repo" ]; then + remote_repo="$2" + shift 2 + + elif [ "$1" = "--sru-cycle" ]; then + sru_cycle="$2" + shift 2 + + else + break + fi +done +if [ "$#" -ne 0 ]; then + { + echo "Usage: $0 []" + echo " --remote-repo " + echo " --sru-cycle " + } 1>&2 + exit 1 +fi + +default_sru_cycle() +{ + local tracking_bug + local version + + # Pick out the cycle from the tracking bug file. + if [ -f "$DEBIAN/tracking-bug" ]; then + read tracking_bug sru_cycle X <"$DEBIAN/tracking-bug" + fi + + if [ -z "$sru_cycle" ]; then + echo "$0: sru-cycle not found via debian/tracking-bug; specify --sru-cycle" 1>&2 + exit 1 + fi + + sru_cycle=$(echo "$sru_cycle" | sed -e 's/-[0-9][0-9]*$//' -e 's/^kernel-sru-cycle-//') + + #echo "default_sru_cycle: version<$version> sru_cycle<$sru_cycle>" +} + +# Determine where our changelog is. +DEBIAN=debian +[ -f 'debian/debian.env' ] && . 'debian/debian.env' + +[ -z "$sru_cycle" ] && default_sru_cycle +if [ -z "$remote_repo" ]; then + case "$sru_cycle" in + s[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]) + remote_repo='security' ;; + *) + remote_repo='main' ;; + esac +fi +case "$remote_repo" in +security) + remote_repo='ssh+git://git.launchpad.net/~canonical-kernel-security-team/canonical-kernel-private/+git/kernel-versions' + remote_name='security' + ;; +main) + remote_repo='git://git.launchpad.net/~canonical-kernel/+git/kernel-versions' + remote_name='main' + ;; +*) + remote_name='adhoc' + ;; +esac + +# +# kernel-versoins repository dkms-version mapping see below for details: +# https://git.launchpad.net/~canonical-kernel/+git/kernel-versions/plain/README +# +kv_repo="$HOME/.cache/kernel-versions-bare" +git_base="$remote_name/$sru_cycle" + +# Now we know where our repo is and what it called update it. +# We maintain "persistent" remotes for main and security, but assume +# any manually supplied entries are transient. +( + [ ! -d "$kv_repo" ] && mkdir -p "$kv_repo" + cd "$kv_repo" || exit 1 + [ ! -f config ] && git init -q --bare + current_url=$(git config "remote.$remote_name.url") + if [ -z "$current_url" ]; then + git remote add "$remote_name" "$remote_repo" + elif [ "$current_url" != "$remote_repo" ]; then + git config "remote.$remote_name.url" "$remote_repo" + fi + git fetch -q -p "$remote_name" +) || exit 1 + +cat_file() +{ + (cd "$kv_repo" && git cat-file "$@") || exit 1 +} + +# 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 +fi + +# Determine our series and mainline version from our own changelog. +our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SDistribution) +if [ "$series" = "UNRELEASED" ]; then + our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -c1 -SDistribution) +fi +our_mainline=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion | sed -e 's/-.*//') + +# Update rules are complex. We update development series kernels to the +# versions in development. For stable series we update versions against +# the series in which our prime kernel was built. This is expressed +# via the map/dkms-versions namespace. Attempt to map via our series +# and then our mainline-version. + +# Attempt to map via our series, if that works assume we are development. +versions_path=$(cat_file -p "$git_base:map/dkms-versions/$our_series" 2>/dev/null) + +# If we do not yet have a mapping re-map using our mainline version. +if [ -z "$versions_path" ]; then + versions_path=$(cat_file -p "$git_base:map/dkms-versions/$our_mainline") +fi + +echo "git_base<$git_base> versions_path<$versions_path>" +echo "II: grabbing dkms-versions from $sru_cycle $versions_path" + +cat_file -p "$git_base:$versions_path" >"debian/dkms-versions.new" +rc="$?" +if [ "$rc" -ne 0 ]; then + echo "$0: unable to download an updated dkms-versions file" 1>&2 + exit 1 + +elif [ "$rc" -eq 0 ]; then + mv "debian/dkms-versions.new" "debian/dkms-versions" + +else + rm -f "debian/dkms-versions.new" +fi + +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" +else + echo "$thing: no changes from kernel-versions" +fi + +exit "$rc" diff -Nru linux-restricted-modules-gcp-5.4.0/update-version linux-restricted-modules-gcp-5.4.0/update-version --- linux-restricted-modules-gcp-5.4.0/update-version 2021-07-17 07:44:39.000000000 +0000 +++ linux-restricted-modules-gcp-5.4.0/update-version 2021-07-24 07:55:59.000000000 +0000 @@ -1,9 +1,13 @@ #!/bin/bash +here=$(dirname $(readlink -f "$0")) + tag_prefix=`dpkg-parsechangelog -S Source | sed 's/linux-restricted-modules/Ubuntu/'`- commit=: no_update=false +master_version= +master_dir= while : do if [ "$1" = "--commit" ]; then @@ -14,25 +18,33 @@ shift no_update=true + elif [ "$1" = "--master-version" ]; then + master_version="$2" + shift 2 + else break fi done -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " 1>&2 - exit 1 -fi -master_dir="$1" +if [ "$master_version" = "" ]; then + if [ "$#" -ne 1 ]; then + echo "Usage: $0 " 1>&2 + exit 1 + fi + master_dir="$1" -# Work out the master kernel version. -if [ -f "$master_dir/debian/debian.env" ]; then - branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` - changelog="-l$branch/changelog" + # Work out the master kernel version. + if [ -f "$master_dir/debian/debian.env" ]; then + branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` + changelog="-l$branch/changelog" + else + changelog="" + fi + master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -SVersion $changelog)` else - changelog="" + no_update=true fi -master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -S Version $changelog)` # Work out our current version taking into account closed sections. here_series=$( LC_ALL=C dpkg-parsechangelog -S Distribution ) @@ -51,21 +63,29 @@ exit 1 fi +update_file() +{ + local src="$1" + local dst="$2" + cp -p "$src" "$dst" || exit 1 + if ! git diff --exit-code -- "$dst" >/dev/null; then + git commit -m "UBUNTU: $dst -- update from master" -s -- "$dst" + else + echo "$dst: no changes from master" + fi +} + # Update things from the primary package. if [ "$no_update" = 'false' ]; then - for thing in \ - debian/dkms-versions \ + update_file "$master_dir/$branch/tracking-bug" "debian/tracking-bug" + "$here/update-dkms-versions" + for master_file in \ debian/scripts/misc/git-ubuntu-log \ debian/scripts/dkms-build \ debian/scripts/dkms-build--nvidia-N \ debian/scripts/fix-filenames.c do - cp -p "$master_dir/$thing" "$thing" || exit 1 - if ! git diff --exit-code -- "$thing" >/dev/null; then - git commit -m "UBUNTU: $thing -- update from master" -s -- "$thing" - else - echo "$thing: no changes from master" - fi + update_file "$master_dir/$master_file" "$master_file" done fi #echo "here_version<$here_version>"