diff -Nru linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog --- linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog 2024-03-21 12:45:46.000000000 +0000 +++ linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog 2024-03-25 18:39:08.000000000 +0000 @@ -1,3 +1,12 @@ +linux-generate-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium + + * Main version: 6.5.0-1017.17~22.04.2 + + * Packaging resync (LP: #1786013) + - [Packaging] remove update-version script + + -- Philip Cox Mon, 25 Mar 2024 14:39:08 -0400 + linux-generate-aws-6.5 (6.5.0-1017.17~22.04.1) jammy; urgency=medium * Master version: 6.5.0-1017.17~22.04.1 @@ -34,15 +43,3 @@ -- Philip Cox Thu, 15 Feb 2024 07:09:10 -0500 -linux-generate-aws-6.5 (6.5.0-1013.13~22.04.1) jammy; urgency=medium - - * Master version: 6.5.0-1013.13~22.04.1 - - * Packaging resync (LP: #1786013) - - [Packaging] update variants - - * Miscellaneous Ubuntu changes - - debian/tracking-bug -- update from master - - -- Tim Gardner Tue, 16 Jan 2024 09:56:28 -0700 - diff -Nru linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common --- linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common 2024-03-21 12:45:46.000000000 +0000 +++ linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common 2024-03-25 18:39:08.000000000 +0000 @@ -9,6 +9,6 @@ python3-apt, Build-Depends-Arch: sbsigntool [amd64 arm64], - linux-image-unsigned-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1) [amd64 arm64], - linux-buildinfo-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1) [amd64 arm64], + linux-image-unsigned-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64], + linux-buildinfo-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64], Standards-Version: 3.9.4 diff -Nru linux-signed-aws-6.5-6.5.0/debian/changelog linux-signed-aws-6.5-6.5.0/debian/changelog --- linux-signed-aws-6.5-6.5.0/debian/changelog 2024-03-21 12:45:46.000000000 +0000 +++ linux-signed-aws-6.5-6.5.0/debian/changelog 2024-03-25 18:39:08.000000000 +0000 @@ -1,3 +1,12 @@ +linux-signed-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium + + * Main version: 6.5.0-1017.17~22.04.2 + + * Packaging resync (LP: #1786013) + - [Packaging] remove update-version script + + -- Philip Cox Mon, 25 Mar 2024 14:39:08 -0400 + linux-signed-aws-6.5 (6.5.0-1017.17~22.04.1) jammy; urgency=medium * Master version: 6.5.0-1017.17~22.04.1 diff -Nru linux-signed-aws-6.5-6.5.0/debian/control linux-signed-aws-6.5-6.5.0/debian/control --- linux-signed-aws-6.5-6.5.0/debian/control 2024-03-21 12:45:46.000000000 +0000 +++ linux-signed-aws-6.5-6.5.0/debian/control 2024-03-25 18:39:08.000000000 +0000 @@ -9,9 +9,9 @@ python3-apt, Build-Depends-Arch: sbsigntool [amd64 arm64], - linux-image-unsigned-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1) [amd64 arm64], - linux-buildinfo-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1) [amd64 arm64], - linux-generate-aws-6.5 (= 6.5.0-1017.17~22.04.1), + linux-image-unsigned-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64], + linux-buildinfo-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64], + linux-generate-aws-6.5 (= 6.5.0-1017.17~22.04.2), Standards-Version: 3.9.4 Package: linux-image-6.5.0-1017-aws @@ -21,7 +21,7 @@ Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux-aws-6.5 (= 6.5.0-1017.17~22.04.1) +Built-Using: linux-aws-6.5 (= 6.5.0-1017.17~22.04.2) Description: Signed kernel image aws A kernel image for aws. This version of it is signed with Canonical's signing key. diff -Nru linux-signed-aws-6.5-6.5.0/update-version linux-signed-aws-6.5-6.5.0/update-version --- linux-signed-aws-6.5-6.5.0/update-version 2024-03-20 16:52:16.000000000 +0000 +++ linux-signed-aws-6.5-6.5.0/update-version 1970-01-01 00:00:00.000000000 +0000 @@ -1,132 +0,0 @@ -#!/bin/bash - -here=$(dirname $(readlink -f "$0")) - -tag_prefix=`dpkg-parsechangelog -SSource | sed 's/linux-signed/Ubuntu/'`- - -commit=: -no_update=false -master_version= -master_dir= -while : -do - if [ "$1" = "--commit" ]; then - shift - commit= - - elif [ "$1" = "--no-update" ]; then - shift - no_update=true - - elif [ "$1" = "--master-version" ]; then - master_version="$2" - shift 2 - - else - break - fi -done - -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" - else - changelog="" - fi - master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -SVersion $changelog)` -else - no_update=true -fi - -# Work out our current version taking into account closed sections. -here_series=$( LC_ALL=C dpkg-parsechangelog -SDistribution ) -if [ "$here_series" = "UNRELEASED" ]; then - here_version=$( LC_ALL=C dpkg-parsechangelog -o 1 -SVersion ) - here_series=$( LC_ALL=C dpkg-parsechangelog -c 1 -SDistribution ) -else - here_version=$( LC_ALL=C dpkg-parsechangelog -SVersion ) -fi - -# 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 ]; then - echo "$0: $here_tagversion: tag not found" 1>&2 - 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 - update_file "$master_dir/$branch/tracking-bug" "debian/tracking-bug" -fi -#echo "here_version<$here_version>" -#echo "master_version<$master_version>" - -# Work out a sensible new version based on the primary kernel version. -if dpkg --compare-versions "$here_version" lt "$master_version"; then - here_newversion="$master_version" - -elif dpkg --compare-versions "$here_version" eq "$master_version"; then - here_newversion="$master_version+1" -else - minor=$(( ${here_version##*+} + 1 )) - here_newversion="$master_version+$minor" -fi - -# First insert any primary changes. -marker="__CHANGELOG_FRAGMENT_MARKER__" -dch --newversion "$here_newversion" "$marker" - -# Prepare the blank changelog. -tmp="/tmp/$$.msg" - -# Note we are being synced to the master version. -if dpkg --compare-versions "$here_version" lt "$master_version"; then - echo "Updated to version: $master_version" - [ -f "$tmp" ] && echo "" >>"$tmp" - echo " * Master version: $master_version" >>"$tmp" -fi - -# Format any existing commits. -count=$( git log --oneline "$here_tagversion".. | wc -l ) -if [ "$count" != 0 ]; then - [ -f "$tmp" ] && echo "" >>"$tmp" - git log "$here_tagversion".. | "debian/scripts/misc/git-ubuntu-log" >>"$tmp" -fi - -# Insert official changelog fragment. -sed -i -e '/^ \* '"$marker"'/{ -r '"$tmp"' -d -}' debian/changelog -rm -f "$tmp" - -# Close this changelog entry. -dch --distribution "$here_series" --release '' - -# Emit final closing commands. -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"