diff -Nru linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/changelog linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/changelog --- linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/changelog 2023-07-13 18:24:43.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/changelog 2023-07-27 23:24:00.000000000 +0000 @@ -1,3 +1,13 @@ +linux-restricted-generate-oracle (5.15.0-1039.45+1) jammy; urgency=medium + + * standardise ancillary naming to simplify backporting (LP: #2019299) + - [Packaging] convert to v7.8 autogen form + + * Packaging resync (LP: #1786013) + - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.06.12) + + -- Andy Whitcroft Fri, 28 Jul 2023 00:24:00 +0100 + linux-restricted-generate-oracle (5.15.0-1039.45) jammy; urgency=medium * Master version: 5.15.0-1039.45 @@ -51,12 +61,3 @@ -- Cory Todd Wed, 17 May 2023 12:40:14 -0700 -linux-restricted-generate-oracle (5.15.0-1035.41) jammy; urgency=medium - - * Master version: 5.15.0-1035.41 - - * Miscellaneous Ubuntu changes - - debian/tracking-bug -- update from master - - -- Cory Todd Fri, 21 Apr 2023 10:42:55 -0700 - diff -Nru linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions --- linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions 2023-07-13 18:24:43.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions 2023-07-27 23:24:00.000000000 +0000 @@ -2,8 +2,8 @@ nvidia-graphics-drivers-470 470.199.02-0ubuntu0.22.04.1 arch=amd64 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-525 525.125.06-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495 nvidia-graphics-drivers-525 525.125.06-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open -nvidia-graphics-drivers-535 535.54.03-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-530 -nvidia-graphics-drivers-535 535.54.03-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open +nvidia-graphics-drivers-535 535.86.05-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-530 +nvidia-graphics-drivers-535 535.86.05-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open nvidia-graphics-drivers-418-server 418.226.00-0ubuntu5~0.22.04.1 arch=amd64 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server nvidia-graphics-drivers-470-server 470.199.02-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server diff -Nru linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/changelog linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/changelog --- linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/changelog 2023-07-13 18:24:43.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/changelog 2023-07-27 23:24:00.000000000 +0000 @@ -1,3 +1,13 @@ +linux-restricted-signatures-oracle (5.15.0-1039.45+1) jammy; urgency=medium + + * standardise ancillary naming to simplify backporting (LP: #2019299) + - [Packaging] convert to v7.8 autogen form + + * Packaging resync (LP: #1786013) + - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.06.12) + + -- Andy Whitcroft Fri, 28 Jul 2023 00:24:00 +0100 + linux-restricted-signatures-oracle (5.15.0-1039.45) jammy; urgency=medium * Master version: 5.15.0-1039.45 @@ -51,12 +61,3 @@ -- Cory Todd Wed, 17 May 2023 12:40:14 -0700 -linux-restricted-signatures-oracle (5.15.0-1035.41) jammy; urgency=medium - - * Master version: 5.15.0-1035.41 - - * Miscellaneous Ubuntu changes - - debian/tracking-bug -- update from master - - -- Cory Todd Fri, 21 Apr 2023 10:42:55 -0700 - diff -Nru linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions --- linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions 2023-07-13 18:24:43.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions 2023-07-27 23:24:00.000000000 +0000 @@ -2,8 +2,8 @@ nvidia-graphics-drivers-470 470.199.02-0ubuntu0.22.04.1 arch=amd64 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-525 525.125.06-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495 nvidia-graphics-drivers-525 525.125.06-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open -nvidia-graphics-drivers-535 535.54.03-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-530 -nvidia-graphics-drivers-535 535.54.03-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open +nvidia-graphics-drivers-535 535.86.05-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-530 +nvidia-graphics-drivers-535 535.86.05-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open nvidia-graphics-drivers-418-server 418.226.00-0ubuntu5~0.22.04.1 arch=amd64 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server nvidia-graphics-drivers-470-server 470.199.02-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server diff -Nru linux-restricted-modules-oracle-5.15.0/debian/changelog linux-restricted-modules-oracle-5.15.0/debian/changelog --- linux-restricted-modules-oracle-5.15.0/debian/changelog 2023-07-13 18:24:43.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/changelog 2023-07-27 23:24:00.000000000 +0000 @@ -1,3 +1,13 @@ +linux-restricted-modules-oracle (5.15.0-1039.45+1) jammy; urgency=medium + + * standardise ancillary naming to simplify backporting (LP: #2019299) + - [Packaging] convert to v7.8 autogen form + + * Packaging resync (LP: #1786013) + - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.06.12) + + -- Andy Whitcroft Fri, 28 Jul 2023 00:24:00 +0100 + linux-restricted-modules-oracle (5.15.0-1039.45) jammy; urgency=medium * Master version: 5.15.0-1039.45 diff -Nru linux-restricted-modules-oracle-5.15.0/debian/control linux-restricted-modules-oracle-5.15.0/debian/control --- linux-restricted-modules-oracle-5.15.0/debian/control 2023-07-13 18:24:43.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/control 2023-07-27 23:24:00.000000000 +0000 @@ -21,7 +21,7 @@ nvidia-graphics-drivers-470-server (= 470.199.02-0ubuntu0.22.04.1), nvidia-graphics-drivers-525 (= 525.125.06-0ubuntu0.22.04.1), nvidia-graphics-drivers-525-server (= 525.125.06-0ubuntu0.22.04.1), - nvidia-graphics-drivers-535 (= 535.54.03-0ubuntu0.22.04.1), + nvidia-graphics-drivers-535 (= 535.86.05-0ubuntu0.22.04.1), nvidia-graphics-drivers-535-server (= 535.54.03-0ubuntu0.22.04.1), Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-oracle/+git/jammy @@ -310,7 +310,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-390-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-390}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -350,7 +350,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-470-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-470}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -390,7 +390,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-525-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-525}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -448,7 +448,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-535-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-535}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -506,7 +506,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-418-server-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-418-server}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -546,7 +546,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-450-server-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-450-server}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -586,7 +586,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-470-server-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-470-server}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -626,7 +626,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-525-server-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-525-server}, Description: Linux kernel nvidia modules for version 5.15.0-1039 @@ -666,7 +666,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1039-oracle | linux-image-unsigned-5.15.0-1039-oracle, - linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45), + linux-signatures-nvidia-5.15.0-1039-oracle (= 5.15.0-1039.45+1), linux-objects-nvidia-535-server-5.15.0-1039-oracle (= ${binary:Version}), ${nvk:nvidia-535-server}, Description: Linux kernel nvidia modules for version 5.15.0-1039 diff -Nru linux-restricted-modules-oracle-5.15.0/debian/dkms-versions linux-restricted-modules-oracle-5.15.0/debian/dkms-versions --- linux-restricted-modules-oracle-5.15.0/debian/dkms-versions 2023-07-13 18:24:42.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/dkms-versions 2023-07-27 23:23:59.000000000 +0000 @@ -2,8 +2,8 @@ nvidia-graphics-drivers-470 470.199.02-0ubuntu0.22.04.1 arch=amd64 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-525 525.125.06-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495 nvidia-graphics-drivers-525 525.125.06-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open -nvidia-graphics-drivers-535 535.54.03-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-530 -nvidia-graphics-drivers-535 535.54.03-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open +nvidia-graphics-drivers-535 535.86.05-0ubuntu0.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-530 +nvidia-graphics-drivers-535 535.86.05-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open nvidia-graphics-drivers-418-server 418.226.00-0ubuntu5~0.22.04.1 arch=amd64 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server nvidia-graphics-drivers-470-server 470.199.02-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server diff -Nru linux-restricted-modules-oracle-5.15.0/debian/lrm-version linux-restricted-modules-oracle-5.15.0/debian/lrm-version --- linux-restricted-modules-oracle-5.15.0/debian/lrm-version 2023-07-13 14:32:42.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/debian/lrm-version 2023-07-27 23:14:26.000000000 +0000 @@ -1 +1 @@ -7.7 2019299 +7.8 2019299 diff -Nru linux-restricted-modules-oracle-5.15.0/update-dkms-versions linux-restricted-modules-oracle-5.15.0/update-dkms-versions --- linux-restricted-modules-oracle-5.15.0/update-dkms-versions 2023-07-03 19:46:32.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/update-dkms-versions 2023-07-27 21:59:07.000000000 +0000 @@ -1,6 +1,7 @@ #!/bin/bash remote_repo='' +remote_branch='main' sru_cycle= while : do @@ -8,6 +9,10 @@ remote_repo="$2" shift 2 + elif [ "$1" = "--remote-branch" ]; then + remote_branch="$2" + shift 2 + elif [ "$1" = "--sru-cycle" ]; then sru_cycle="$2" shift 2 @@ -77,7 +82,6 @@ # 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 @@ -100,13 +104,24 @@ (cd "$kv_repo" && git cat-file "$@") || exit 1 } +# Determine if this is merge format (main branch exists). +present=$(cat_file -t "$remote_name/main" 2>/dev/null) +if [ "$present" ]; then + git_base="$remote_name/$remote_branch:$sru_cycle/" + git_base_devel="$remote_name/$remote_branch:tip/" +else + git_base="$remote_name/$sru_cycle:" + git_base_devel="$remote_name/master:" +fi +git_human="$remote_name/$sru_cycle" + # Determine if we have this cycle. present=$(cat_file -t "$git_base" 2>/dev/null) if [ "$present" = "" ]; then # 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" ;; + d*) git_base="$git_base_devel" ;; *) echo "$sru_cycle: cycle not found in $remote_repo" 2>&1 exit 1 ;; @@ -146,7 +161,7 @@ "$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)) + versions_paths=$(echo $(cat_file -p "${git_base}map/dkms-versions/$versions_path_tail" 2>/dev/null)) [ -n "$versions_paths" ] && break done @@ -161,7 +176,7 @@ : ">debian/dkms-versions.new" for versions_path in $versions_paths do - cat_file -p "$git_base:$versions_path" >>"debian/dkms-versions.new" + 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 @@ -171,7 +186,7 @@ thing="debian/dkms-versions" if ! git diff --exit-code -- "$thing" >/dev/null; then - git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_base)" \ + git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_human)" \ -m "BugLink: https://bugs.launchpad.net/bugs/1786013" \ -s -- "$thing" else diff -Nru linux-restricted-modules-oracle-5.15.0/update-version linux-restricted-modules-oracle-5.15.0/update-version --- linux-restricted-modules-oracle-5.15.0/update-version 2022-11-10 20:41:42.000000000 +0000 +++ linux-restricted-modules-oracle-5.15.0/update-version 2023-07-27 21:57:48.000000000 +0000 @@ -8,6 +8,7 @@ no_update=false master_version= master_dir= +namespace= while : do if [ "$1" = "--commit" ]; then @@ -22,6 +23,10 @@ master_version="$2" shift 2 + elif [ "$1" = "--namespace" ]; then + namespace="$2" + shift 2 + else break fi @@ -58,6 +63,10 @@ # Ensure we have the appropriate tag. here_tagversion=$( echo "$tag_prefix$here_version" | sed -e 's/~/_/g' ) count=$( git for-each-ref "refs/tags/$here_tagversion" | wc -l ) +if [ "$count" != 1 -a "$namespace" != "" ]; then + here_tagversion=$( echo "$namespace$tag_prefix$here_version" | sed -e 's/~/_/g' ) + count=$( git for-each-ref "refs/tags/$here_tagversion" | wc -l ) +fi if [ "$count" != 1 ]; then echo "$0: $here_tagversion: tag not found" 1>&2 exit 1 @@ -137,5 +146,5 @@ echo "git commit -s -m 'UBUNTU: $tag_prefix$here_newversion' debian/changelog" $commit git commit -s -m "UBUNTU: $tag_prefix$here_newversion" debian/changelog here_tagversion=$( echo "$tag_prefix$here_newversion" | sed -e 's/~/_/g' ) -echo "git tag -s -m '$tag_prefix$here_newversion' '$here_tagversion'" -$commit git tag -s -m "$tag_prefix$here_newversion" "$here_tagversion" +echo "git tag -s -m '$tag_prefix$here_newversion' '$namespace$here_tagversion'" +$commit git tag -s -m "$tag_prefix$here_newversion" "$namespace$here_tagversion"