diff -Nru linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog --- linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog 2024-03-21 12:46:05.000000000 +0000 +++ linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-generate/debian/changelog 2024-03-25 18:42:42.000000000 +0000 @@ -1,3 +1,13 @@ +linux-restricted-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 + - [Packaging] remove update-dkms-versions script + + -- Philip Cox Mon, 25 Mar 2024 14:42:42 -0400 + linux-restricted-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 @@ -43,16 +53,3 @@ -- Philip Cox Thu, 15 Feb 2024 07:10:13 -0500 -linux-restricted-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 - - debian/dkms-versions -- update from kernel-versions (main/2024.01.08) - - * Miscellaneous Ubuntu changes - - debian/tracking-bug -- update from master - - -- Tim Gardner Tue, 16 Jan 2024 09:56:10 -0700 - diff -Nru linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog --- linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog 2024-03-21 12:46:05.000000000 +0000 +++ linux-restricted-modules-aws-6.5-6.5.0/debian/ancillary/linux-restricted-signatures/debian/changelog 2024-03-25 18:42:42.000000000 +0000 @@ -1,3 +1,13 @@ +linux-restricted-signatures-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 + - [Packaging] remove update-dkms-versions script + + -- Philip Cox Mon, 25 Mar 2024 14:42:42 -0400 + linux-restricted-signatures-aws-6.5 (6.5.0-1017.17~22.04.1) jammy; urgency=medium * Master version: 6.5.0-1017.17~22.04.1 @@ -43,16 +53,3 @@ -- Philip Cox Thu, 15 Feb 2024 07:10:13 -0500 -linux-restricted-signatures-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 - - debian/dkms-versions -- update from kernel-versions (main/2024.01.08) - - * Miscellaneous Ubuntu changes - - debian/tracking-bug -- update from master - - -- Tim Gardner Tue, 16 Jan 2024 09:56:10 -0700 - diff -Nru linux-restricted-modules-aws-6.5-6.5.0/debian/changelog linux-restricted-modules-aws-6.5-6.5.0/debian/changelog --- linux-restricted-modules-aws-6.5-6.5.0/debian/changelog 2024-03-21 12:46:05.000000000 +0000 +++ linux-restricted-modules-aws-6.5-6.5.0/debian/changelog 2024-03-25 18:42:42.000000000 +0000 @@ -1,3 +1,13 @@ +linux-restricted-modules-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 + - [Packaging] remove update-dkms-versions script + + -- Philip Cox Mon, 25 Mar 2024 14:42:42 -0400 + linux-restricted-modules-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-restricted-modules-aws-6.5-6.5.0/debian/control linux-restricted-modules-aws-6.5-6.5.0/debian/control --- linux-restricted-modules-aws-6.5-6.5.0/debian/control 2024-03-21 12:46:05.000000000 +0000 +++ linux-restricted-modules-aws-6.5-6.5.0/debian/control 2024-03-25 18:42:42.000000000 +0000 @@ -9,7 +9,7 @@ curl, dkms, gawk, - linux-headers-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.1) [amd64 arm64], + linux-headers-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.2) [amd64 arm64], lsb-release, python3, python3-apt, @@ -494,7 +494,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws, - linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1), + linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2), linux-objects-nvidia-470-6.5.0-1017-aws (= ${binary:Version}), ${nvk:nvidia-470}, Description: Linux kernel nvidia modules for version 6.5.0-1017 @@ -534,7 +534,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws, - linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1), + linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2), linux-objects-nvidia-535-6.5.0-1017-aws (= ${binary:Version}), ${nvk:nvidia-535}, Description: Linux kernel nvidia modules for version 6.5.0-1017 @@ -592,7 +592,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws, - linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1), + linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2), linux-objects-nvidia-545-6.5.0-1017-aws (= ${binary:Version}), ${nvk:nvidia-545}, Description: Linux kernel nvidia modules for version 6.5.0-1017 @@ -650,7 +650,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws, - linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1), + linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2), linux-objects-nvidia-470-server-6.5.0-1017-aws (= ${binary:Version}), ${nvk:nvidia-470-server}, Description: Linux kernel nvidia modules for version 6.5.0-1017 @@ -690,7 +690,7 @@ ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws, - linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.1), + linux-signatures-nvidia-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2), linux-objects-nvidia-535-server-6.5.0-1017-aws (= ${binary:Version}), ${nvk:nvidia-535-server}, Description: Linux kernel nvidia modules for version 6.5.0-1017 diff -Nru linux-restricted-modules-aws-6.5-6.5.0/update-dkms-versions linux-restricted-modules-aws-6.5-6.5.0/update-dkms-versions --- linux-restricted-modules-aws-6.5-6.5.0/update-dkms-versions 2023-11-10 07:15:01.000000000 +0000 +++ linux-restricted-modules-aws-6.5-6.5.0/update-dkms-versions 1970-01-01 00:00:00.000000000 +0000 @@ -1,195 +0,0 @@ -#!/bin/bash - -remote_repo='' -remote_branch='main' -sru_cycle= -while : -do - if [ "$1" = "--remote-repo" ]; then - 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 - - 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 - c[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" - -# 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 -} - -present=$(cat_file -t "$remote_name/$remote_branch:devel/" 2>/dev/null) -if [ "$present" ]; then - git_base_devel="$remote_name/$remote_branch:devel/" -else - 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. -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="$git_base_devel" ;; - *) 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 [ "$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 -# 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. - -# 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_mainline:$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 - -if [ -z "$versions_paths" ]; then - echo "$0: unable to identify dkms-versions mapping" 1>&2 - exit 1 -fi - -echo "git_base<$git_base> versions_paths<$versions_paths>" -echo "II: grabbing dkms-versions from $sru_cycle $versions_paths" - -: ">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_human)" \ - -m "BugLink: https://bugs.launchpad.net/bugs/1786013" \ - -s -- "$thing" -else - echo "$thing: no changes from kernel-versions" -fi - -exit 0 diff -Nru linux-restricted-modules-aws-6.5-6.5.0/update-version linux-restricted-modules-aws-6.5-6.5.0/update-version --- linux-restricted-modules-aws-6.5-6.5.0/update-version 2024-03-20 16:52:16.000000000 +0000 +++ linux-restricted-modules-aws-6.5-6.5.0/update-version 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ -#!/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= -namespace= -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 - - elif [ "$1" = "--namespace" ]; then - namespace="$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 -S Distribution ) -if [ "$here_series" = "UNRELEASED" ]; then - here_version=$( LC_ALL=C dpkg-parsechangelog -o 1 -S Version ) - here_series=$( LC_ALL=C dpkg-parsechangelog -c 1 -S Distribution ) -else - here_version=$( LC_ALL=C dpkg-parsechangelog -S Version ) -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 -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 -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" - "$here/update-dkms-versions" || exit 1 - 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 - update_file "$master_dir/$master_file" "$master_file" - done -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' '$namespace$here_tagversion'" -$commit git tag -s -m "$tag_prefix$here_newversion" "$namespace$here_tagversion"