diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/changelog linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/changelog --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/changelog 2024-03-09 03:36:12.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/changelog 2024-04-03 02:09:57.000000000 +0000 @@ -1,3 +1,29 @@ +linux-meta-azure-6.5 (6.5.0.1019.20~22.04.1) jammy; urgency=medium + + * Bump ABI 6.5.0-1019.20~22.04 + + -- Tim Gardner Tue, 02 Apr 2024 20:09:57 -0600 + +linux-meta-azure-6.5 (6.5.0.1018.19~22.04.2) jammy; urgency=medium + + + * Miscellaneous Ubuntu changes + - debian/dkms-versions -- update from main + + -- Tim Gardner Thu, 21 Mar 2024 09:33:15 -0600 + +linux-meta-azure-6.5 (6.5.0.1018.19~22.04.1) jammy; urgency=medium + + * Bump ABI 6.5.0-1018.19~22.04 + + * Packaging resync (LP: #1786013) + - [Packaging] remove update-version script + + * Miscellaneous Ubuntu changes + - debian/dkms-versions -- update from main + + -- Tim Gardner Wed, 20 Mar 2024 10:46:23 -0600 + linux-meta-azure-6.5 (6.5.0.1017.17~22.04.1) jammy; urgency=medium * Bump ABI 6.5.0-1017.17~22.04 diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control 2024-03-09 03:36:12.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control 2024-04-03 02:09:57.000000000 +0000 @@ -5,9 +5,9 @@ Standards-Version: 3.9.8 Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, kmod Build-Depends-Arch: - linux-azure-6.5-headers-6.5.0-1017, - linux-headers-6.5.0-1017-azure, - linux-modules-6.5.0-1017-azure, + linux-azure-6.5-headers-6.5.0-1019, + linux-headers-6.5.0-1019-azure, + linux-modules-6.5.0-1019-azure, Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-meta-azure/+git/jammy Package: linux-headers-azure @@ -180,69 +180,3 @@ This package will always depend on the latest Linux kernel versioned cloud tools available for Azure systems. - -Package: linux-modules-ipu6-azure -Architecture: amd64 -Section: kernel -Provides: ${dkms:ipu6-modules} -Depends: - ${misc:Depends}, - linux-modules-ipu6-${kernel-abi-version}-azure, -Description: Extra drivers for ipu6 for the azure flavour - Install extra signed ipu6 modules compatible with the azure flavour. - - -Package: linux-modules-ipu6-azure-edge -Architecture: amd64 -Section: kernel -Provides: ${dkms:ipu6-modules} -Depends: - ${misc:Depends}, - linux-modules-ipu6-${kernel-abi-version}-azure, -Description: Extra drivers for ipu6 for the azure flavour - Install extra signed ipu6 modules compatible with the azure flavour. - - -Package: linux-modules-ivsc-azure -Architecture: amd64 -Section: kernel -Provides: ${dkms:ivsc-modules} -Depends: - ${misc:Depends}, - linux-modules-ivsc-${kernel-abi-version}-azure, -Description: Extra drivers for ivsc for the azure flavour - Install extra signed ivsc modules compatible with the azure flavour. - - -Package: linux-modules-ivsc-azure-edge -Architecture: amd64 -Section: kernel -Provides: ${dkms:ivsc-modules} -Depends: - ${misc:Depends}, - linux-modules-ivsc-${kernel-abi-version}-azure, -Description: Extra drivers for ivsc for the azure flavour - Install extra signed ivsc modules compatible with the azure flavour. - - -Package: linux-modules-iwlwifi-azure -Architecture: amd64 -Section: kernel -Provides: ${dkms:iwlwifi-modules} -Depends: - ${misc:Depends}, - linux-modules-iwlwifi-${kernel-abi-version}-azure, -Description: Extra drivers for iwlwifi for the azure flavour - Install extra signed iwlwifi modules compatible with the azure flavour. - - -Package: linux-modules-iwlwifi-azure-edge -Architecture: amd64 -Section: kernel -Provides: ${dkms:iwlwifi-modules} -Depends: - ${misc:Depends}, - linux-modules-iwlwifi-${kernel-abi-version}-azure, -Description: Extra drivers for iwlwifi for the azure flavour - Install extra signed iwlwifi modules compatible with the azure flavour. - diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control.d/dkms-ipu6 linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control.d/dkms-ipu6 --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control.d/dkms-ipu6 2024-03-09 03:36:12.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control.d/dkms-ipu6 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ - -Package: linux-modules-ipu6-azure${variant:suffix} -Architecture: amd64 -Section: kernel -Provides: ${dkms:ipu6-modules} -Depends: - ${misc:Depends}, - linux-modules-ipu6-${kernel-abi-version}-azure, -Description: Extra drivers for ipu6 for the azure flavour - Install extra signed ipu6 modules compatible with the azure flavour. diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control.d/dkms-ivsc linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control.d/dkms-ivsc --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control.d/dkms-ivsc 2024-03-09 03:36:12.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control.d/dkms-ivsc 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ - -Package: linux-modules-ivsc-azure${variant:suffix} -Architecture: amd64 -Section: kernel -Provides: ${dkms:ivsc-modules} -Depends: - ${misc:Depends}, - linux-modules-ivsc-${kernel-abi-version}-azure, -Description: Extra drivers for ivsc for the azure flavour - Install extra signed ivsc modules compatible with the azure flavour. diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control.d/dkms-iwlwifi linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control.d/dkms-iwlwifi --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/control.d/dkms-iwlwifi 2024-03-09 03:36:12.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/control.d/dkms-iwlwifi 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ - -Package: linux-modules-iwlwifi-azure${variant:suffix} -Architecture: amd64 -Section: kernel -Provides: ${dkms:iwlwifi-modules} -Depends: - ${misc:Depends}, - linux-modules-iwlwifi-${kernel-abi-version}-azure, -Description: Extra drivers for iwlwifi for the azure flavour - Install extra signed iwlwifi modules compatible with the azure flavour. diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/dkms-versions linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/dkms-versions --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/debian/dkms-versions 2024-03-09 03:32:03.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/debian/dkms-versions 2024-04-03 02:07:01.000000000 +0000 @@ -1,5 +1,2 @@ zfs-linux 2.2.0-0ubuntu1~23.10.2 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms -ipu6-drivers 0~git202310180730.3f813580-0ubuntu0.23.10.1 modulename=ipu6 debpath=pool/universe/i/%package%/intel-ipu6-dkms_%version%_amd64.deb arch=amd64 rprovides=ipu6-modules rprovides=intel-ipu6-dkms type=standalone -ivsc-driver 0~git202212210258.94ecb88b-0ubuntu0.23.10.3 modulename=ivsc debpath=pool/universe/i/%package%/intel-vsc-dkms_%version%_amd64.deb arch=amd64 rprovides=ivsc-modules rprovides=intel-vsc-dkms type=standalone -backport-iwlwifi-dkms 11289-0ubuntu1.23.10.1 modulename=iwlwifi debpath=pool/universe/b/%package%/backport-iwlwifi-dkms_%version%_all.deb arch=amd64 rprovides=iwlwifi-modules rprovides=backport-iwlwifi-dkms type=standalone v4l2loopback 0.12.7-2ubuntu4 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms diff -Nru linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/update-version linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/update-version --- linux-meta-azure-6.5-6.5.0.1017.17~22.04.1/update-version 2023-10-31 16:17:06.000000000 +0000 +++ linux-meta-azure-6.5-6.5.0.1019.20~22.04.1/update-version 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -#!/bin/bash - -tag_prefix=`dpkg-parsechangelog -S Source | sed 's/linux-meta/Ubuntu/'`- - -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 -S Version $changelog)` - -# 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 ]; then - echo "$0: $here_tagversion: tag not found" 1>&2 - exit 1 -fi - -# Update things from the primary package. -for thing in \ - debian/dkms-versions \ - debian/scripts/misc/git-ubuntu-log -do - from="$master_dir/$thing" - to="$thing" - - if [ -f "$from" ]; then - cp -p "$from" "$to" || exit 1 - git add "$to" || exit 1 - else - rm -f "$to" - git rm --ignore-unmatch "$to" || exit 1 - fi - if ! git diff --exit-code HEAD -- "$thing" >/dev/null; then - msg="UBUNTU: [Packaging] resync $thing from main package - -BugLink: http://bugs.launchpad.net/bugs/1786013" - git commit -m "$msg" -s -- "$thing" - else - echo "$thing: no changes from master" - fi -done - -# We need to ensure the ABI number matches our master source. -# extract both for comparison. -here_abi=${here_version%.*} -master_abi=$(echo ${master_version%.*} | sed -e 's/-/./g') -master_abi_human=${master_version%.*} - -if grep -q '[~+][0-9][0-9]\.[0-9][0-9]\.[0-9]\+$' <<<"$master_version" && \ - dpkg --compare-versions "$here_abi" lt "$master_abi"; then - # Version looks like a backport kernel, and this is a new abi. - # Reset the upload number. - here_upload="1" -else - # Extract the upload number from the _previous_ upload and increment it. - here_upload=${here_version##*.} - here_upload=$(( $here_upload + 1 )) -fi -here_newversion="$master_abi.$here_upload" - -#echo "here_version<$here_version> here_abi<$here_abi> here_newversion<$here_newversion>" -#echo "master_version<$master_version> master_abi<$master_abi>" - -# First insert any primary changes. -marker="__CHANGELOG_FRAGMENT_MARKER__" -dch --newversion "$here_newversion" "$marker" - -# Prepare the the blank changelog. -tmp="/tmp/$$.msg" - -# If the parent represents an ABI bump include that. -if dpkg --compare-versions "$here_abi" lt "$master_abi"; then - echo "Updated to ABI: $master_abi" - [ -f "$tmp" ] && echo "" >>"$tmp" - echo " * Bump ABI $master_abi_human" >>"$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" -here_tagversion=$( echo "$tag_prefix$here_newversion" | sed -e 's/~/_/g' ) -echo "git tag -s -m '$tag_prefix$here_newversion' '$here_tagversion'"