diff -Nru linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog --- linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog 2023-11-19 04:58:44.000000000 +0000 +++ linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog 2023-11-21 20:03:07.000000000 +0000 @@ -1,3 +1,12 @@ +linux-restricted-generate-gcp-6.5 (6.5.0-1010.10~22.04.3) jammy; urgency=medium + + * Master version: 6.5.0-1010.10~22.04.3 + + * Packaging resync (LP: #1786013) + - [Packaging] resync update-dkms-versions helper + + -- John Cabaj Tue, 21 Nov 2023 14:03:07 -0600 + linux-restricted-generate-gcp-6.5 (6.5.0-1010.10~22.04.2+2) jammy; urgency=medium * Packaging resync (LP: #1786013) @@ -50,8 +59,3 @@ -- John Cabaj Fri, 17 Nov 2023 16:55:05 -0600 -linux-restricted-generate-gcp-6.5 (6.5.0-1010.0) jammy; urgency=medium - - * Empty entry - - -- John Cabaj Fri, 17 Nov 2023 15:44:54 -0600 diff -Nru linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog --- linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog 2023-11-19 04:58:44.000000000 +0000 +++ linux-restricted-modules-gcp-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog 2023-11-21 20:03:07.000000000 +0000 @@ -1,3 +1,12 @@ +linux-restricted-signatures-gcp-6.5 (6.5.0-1010.10~22.04.3) jammy; urgency=medium + + * Master version: 6.5.0-1010.10~22.04.3 + + * Packaging resync (LP: #1786013) + - [Packaging] resync update-dkms-versions helper + + -- John Cabaj Tue, 21 Nov 2023 14:03:07 -0600 + linux-restricted-signatures-gcp-6.5 (6.5.0-1010.10~22.04.2+2) jammy; urgency=medium * Packaging resync (LP: #1786013) @@ -50,8 +59,3 @@ -- John Cabaj Fri, 17 Nov 2023 16:55:05 -0600 -linux-restricted-signatures-gcp-6.5 (6.5.0-1010.0) jammy; urgency=medium - - * Empty entry - - -- John Cabaj Fri, 17 Nov 2023 15:44:54 -0600 diff -Nru linux-restricted-modules-gcp-6.5-6.5.0/debian/changelog linux-restricted-modules-gcp-6.5-6.5.0/debian/changelog --- linux-restricted-modules-gcp-6.5-6.5.0/debian/changelog 2023-11-19 04:58:44.000000000 +0000 +++ linux-restricted-modules-gcp-6.5-6.5.0/debian/changelog 2023-11-21 20:03:07.000000000 +0000 @@ -1,3 +1,12 @@ +linux-restricted-modules-gcp-6.5 (6.5.0-1010.10~22.04.3) jammy; urgency=medium + + * Master version: 6.5.0-1010.10~22.04.3 + + * Packaging resync (LP: #1786013) + - [Packaging] resync update-dkms-versions helper + + -- John Cabaj Tue, 21 Nov 2023 14:03:07 -0600 + linux-restricted-modules-gcp-6.5 (6.5.0-1010.10~22.04.2+2) jammy; urgency=medium * Packaging resync (LP: #1786013) diff -Nru linux-restricted-modules-gcp-6.5-6.5.0/debian/control linux-restricted-modules-gcp-6.5-6.5.0/debian/control --- linux-restricted-modules-gcp-6.5-6.5.0/debian/control 2023-11-19 04:58:44.000000000 +0000 +++ linux-restricted-modules-gcp-6.5-6.5.0/debian/control 2023-11-21 20:03:07.000000000 +0000 @@ -9,7 +9,7 @@ curl, dkms, gawk, - linux-headers-6.5.0-1010-gcp (>= 6.5.0-1010.10~22.04.2) [amd64 arm64], + linux-headers-6.5.0-1010-gcp (>= 6.5.0-1010.10~22.04.3) [amd64 arm64], lsb-release, python3, python3-apt, @@ -264,7 +264,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1010-gcp | linux-image-unsigned-6.5.0-1010-gcp, - linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.2+2), + linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.3), linux-objects-nvidia-470-6.5.0-1010-gcp (= ${binary:Version}), ${nvk:nvidia-470}, Description: Linux kernel nvidia modules for version 6.5.0-1010 @@ -304,7 +304,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1010-gcp | linux-image-unsigned-6.5.0-1010-gcp, - linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.2+2), + linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.3), linux-objects-nvidia-525-6.5.0-1010-gcp (= ${binary:Version}), ${nvk:nvidia-525}, Description: Linux kernel nvidia modules for version 6.5.0-1010 @@ -362,7 +362,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1010-gcp | linux-image-unsigned-6.5.0-1010-gcp, - linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.2+2), + linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.3), linux-objects-nvidia-535-6.5.0-1010-gcp (= ${binary:Version}), ${nvk:nvidia-535}, Description: Linux kernel nvidia modules for version 6.5.0-1010 @@ -420,7 +420,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1010-gcp | linux-image-unsigned-6.5.0-1010-gcp, - linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.2+2), + linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.3), linux-objects-nvidia-470-server-6.5.0-1010-gcp (= ${binary:Version}), ${nvk:nvidia-470-server}, Description: Linux kernel nvidia modules for version 6.5.0-1010 @@ -460,7 +460,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1010-gcp | linux-image-unsigned-6.5.0-1010-gcp, - linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.2+2), + linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.3), linux-objects-nvidia-525-server-6.5.0-1010-gcp (= ${binary:Version}), ${nvk:nvidia-525-server}, Description: Linux kernel nvidia modules for version 6.5.0-1010 @@ -500,7 +500,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1010-gcp | linux-image-unsigned-6.5.0-1010-gcp, - linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.2+2), + linux-signatures-nvidia-6.5.0-1010-gcp (= 6.5.0-1010.10~22.04.3), linux-objects-nvidia-535-server-6.5.0-1010-gcp (= ${binary:Version}), ${nvk:nvidia-535-server}, Description: Linux kernel nvidia modules for version 6.5.0-1010 diff -Nru linux-restricted-modules-gcp-6.5-6.5.0/update-dkms-versions linux-restricted-modules-gcp-6.5-6.5.0/update-dkms-versions --- linux-restricted-modules-gcp-6.5-6.5.0/update-dkms-versions 2023-11-18 02:41:21.000000000 +0000 +++ linux-restricted-modules-gcp-6.5-6.5.0/update-dkms-versions 2023-11-21 17:27:01.000000000 +0000 @@ -104,15 +104,13 @@ (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) +present=$(cat_file -t "$remote_name/$remote_branch:devel/" 2>/dev/null) if [ "$present" ]; then - git_base="$remote_name/$remote_branch:$sru_cycle/" - git_base_devel="$remote_name/$remote_branch:tip/" + git_base_devel="$remote_name/$remote_branch:devel/" else - git_base="$remote_name/$sru_cycle:" - git_base_devel="$remote_name/master:" + git_base_devel="$remote_name/$remote_branch:tip/" fi +git_base="$remote_name/$remote_branch:$sru_cycle/" git_human="$remote_name/$sru_cycle" # Determine if we have this cycle. @@ -155,6 +153,7 @@ # mainline - backwards compatibility for versions_path_tail in \ "$our_series:$our_source:$our_type" \ + "$our_series:$our_mainline:$our_type" \ "$our_series:$our_type" \ "$our_mainline:$our_type" \ "$our_series" \