diff -Nru linux-restricted-signatures-oracle-5.11-5.11.0/debian/changelog linux-restricted-signatures-oracle-5.11-5.11.0/debian/changelog --- linux-restricted-signatures-oracle-5.11-5.11.0/debian/changelog 2021-11-12 12:59:18.000000000 +0000 +++ linux-restricted-signatures-oracle-5.11-5.11.0/debian/changelog 2021-12-20 21:22:59.000000000 +0000 @@ -1,4 +1,31 @@ -linux-restricted-signatures-oracle-5.11 (5.11.0-1022.23~20.04.1) focal; urgency=medium +linux-restricted-signatures-oracle-5.11 (5.11.0-1023.24~20.04.1+2) focal; urgency=medium + + * Packaging resync (LP: #1786013) + - debian/dkms-versions -- update from kernel-versions (adhoc/2021.11.29) + + -- Andy Whitcroft Mon, 20 Dec 2021 21:22:59 +0000 + +linux-restricted-modules-oracle-5.11 (5.11.0-1023.24~20.04.1+1) focal; urgency=medium + + * Packaging resync (LP: #1786013) + - [Packaging] update variants + + -- Khalid Elmously Thu, 09 Dec 2021 21:28:07 -0500 + +linux-restricted-modules-oracle-5.11 (5.11.0-1023.24~20.04.1) focal; urgency=medium + + * Master version: 5.11.0-1023.24~20.04.1 + + * Packaging resync (LP: #1786013) + - [Packaging] resync update-dkms-versions helper + - debian/dkms-versions -- update from kernel-versions (main/2021.11.29) + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Philip Cox Thu, 02 Dec 2021 12:01:43 -0500 + +linux-restricted-modules-oracle-5.11 (5.11.0-1022.23~20.04.1) focal; urgency=medium * Master version: 5.11.0-1022.23~20.04.1 diff -Nru linux-restricted-signatures-oracle-5.11-5.11.0/debian/control linux-restricted-signatures-oracle-5.11-5.11.0/debian/control --- linux-restricted-signatures-oracle-5.11-5.11.0/debian/control 2021-11-12 12:59:18.000000000 +0000 +++ linux-restricted-signatures-oracle-5.11-5.11.0/debian/control 2021-12-20 21:22:59.000000000 +0000 @@ -9,22 +9,22 @@ curl, dkms, gawk, - linux-restricted-generate-oracle-5.11 (= 5.11.0-1022.23~20.04.1), + linux-restricted-generate-oracle-5.11 (= 5.11.0-1023.24~20.04.1+2), lsb-release, python3, python3-apt, Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-oracle/+git/focal -Package: linux-signatures-nvidia-5.11.0-1022-oracle +Package: linux-signatures-nvidia-5.11.0-1023-oracle Build-Profiles: Architecture: amd64 Section: kernel Priority: optional -Depends: linux-image-5.11.0-1022-oracle | linux-image-unsigned-5.11.0-1022-oracle, +Depends: linux-image-5.11.0-1023-oracle | linux-image-unsigned-5.11.0-1023-oracle, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel signatures for nvidia modules for version 5.11.0-1022-oracle +Description: Linux kernel signatures for nvidia modules for version 5.11.0-1023-oracle This package contains the Linux kernel signatures nvidia modules for - version 5.11.0-1022-oracle. + version 5.11.0-1023-oracle. . You likely do not want to install this package directly. diff -Nru linux-restricted-signatures-oracle-5.11-5.11.0/debian/dkms-versions linux-restricted-signatures-oracle-5.11-5.11.0/debian/dkms-versions --- linux-restricted-signatures-oracle-5.11-5.11.0/debian/dkms-versions 2021-11-12 12:59:18.000000000 +0000 +++ linux-restricted-signatures-oracle-5.11-5.11.0/debian/dkms-versions 2021-12-20 21:22:58.000000000 +0000 @@ -1,8 +1,7 @@ -zfs-linux 2.0.2-1ubuntu5.4 -nvidia-graphics-drivers-390 390.144-0ubuntu0.21.04.1 -nvidia-graphics-drivers-470 470.86-0ubuntu0.21.04.1 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435 -nvidia-graphics-drivers-495 495.44-0ubuntu0.21.04.1 -nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.21.04.1 -nvidia-graphics-drivers-450-server 450.156.00-0ubuntu0.21.04.1 transition=nvidia-graphics-drivers-440-server -nvidia-graphics-drivers-460-server 460.106.00-0ubuntu0.21.04.1 -nvidia-graphics-drivers-470-server 470.82.01-0ubuntu0.21.04.1 +nvidia-graphics-drivers-390 390.144-0ubuntu0.20.04.1 +nvidia-graphics-drivers-470 470.86-0ubuntu0.20.04.2 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435 +nvidia-graphics-drivers-495 495.46-0ubuntu0.20.04.1 +nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 +nvidia-graphics-drivers-450-server 450.156.00-0ubuntu0.20.04.2 transition=nvidia-graphics-drivers-440-server +nvidia-graphics-drivers-460-server 460.106.00-0ubuntu0.20.04.2 +nvidia-graphics-drivers-470-server 470.82.01-0ubuntu0.20.04.2 diff -Nru linux-restricted-signatures-oracle-5.11-5.11.0/debian/tracking-bug linux-restricted-signatures-oracle-5.11-5.11.0/debian/tracking-bug --- linux-restricted-signatures-oracle-5.11-5.11.0/debian/tracking-bug 2021-11-12 12:50:50.000000000 +0000 +++ linux-restricted-signatures-oracle-5.11-5.11.0/debian/tracking-bug 2021-12-20 21:22:57.000000000 +0000 @@ -1 +1 @@ -1949795 2021.11.08-1 +1952272 2021.11.29-1 diff -Nru linux-restricted-signatures-oracle-5.11-5.11.0/debian/variants linux-restricted-signatures-oracle-5.11-5.11.0/debian/variants --- linux-restricted-signatures-oracle-5.11-5.11.0/debian/variants 2021-11-12 12:59:15.000000000 +0000 +++ linux-restricted-signatures-oracle-5.11-5.11.0/debian/variants 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ --- --edge diff -Nru linux-restricted-signatures-oracle-5.11-5.11.0/update-dkms-versions linux-restricted-signatures-oracle-5.11-5.11.0/update-dkms-versions --- linux-restricted-signatures-oracle-5.11-5.11.0/update-dkms-versions 2021-09-27 18:53:21.000000000 +0000 +++ linux-restricted-signatures-oracle-5.11-5.11.0/update-dkms-versions 2021-12-20 21:22:57.000000000 +0000 @@ -103,16 +103,28 @@ # 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. 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) +if [ "$our_series" = "UNRELEASED" ]; then + our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -o1 -c1 -SDistribution) fi our_mainline=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion | sed -e 's/-.*//') +our_package=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SSource) +our_source=$(echo "$our_package" | sed -e 's/-restricted-modules//') +case "$our_package" in +linux-restricted-modules*) our_type="lrm" ;; +*) our_type="main" ;; +esac # Update rules are complex. We update development series kernels to the # versions in development. For stable series we update versions against @@ -120,35 +132,50 @@ # 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" +# Try and find a package specific dkms-versions fragment. Try: +# handle+type +# series+type +# mainline+type +# series - backwards compatibility +# mainline - backwards compatibility +for versions_path_tail in \ + "$our_series:$our_source:$our_type" \ + "$our_series:$our_type" \ + "$our_mainline:$our_type" \ + "$our_series" \ + "$our_mainline" +do + echo "II: trying $versions_path_tail ..." + versions_paths=$(echo $(cat_file -p "$git_base:map/dkms-versions/$versions_path_tail" 2>/dev/null)) + [ -n "$versions_paths" ] && break +done -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 +if [ -z "$versions_paths" ]; then + echo "$0: unable to identify dkms-versions mapping" 1>&2 exit 1 +fi -elif [ "$rc" -eq 0 ]; then - mv "debian/dkms-versions.new" "debian/dkms-versions" +echo "git_base<$git_base> versions_paths<$versions_paths>" +echo "II: grabbing dkms-versions from $sru_cycle $versions_paths" -else - rm -f "debian/dkms-versions.new" -fi +: ">debian/dkms-versions.new" +for versions_path in $versions_paths +do + cat_file -p "$git_base:$versions_path" >>"debian/dkms-versions.new" + if [ "$?" -ne 0 ]; then + echo "$0: unable to download an updated dkms-versions file" 1>&2 + exit 1 + fi +done +mv "debian/dkms-versions.new" "debian/dkms-versions" 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 -exit "$rc" +exit 0