diff -Nru linux-generate-azure-6.5-6.5.0/debian/changelog linux-generate-azure-6.5-6.5.0/debian/changelog --- linux-generate-azure-6.5-6.5.0/debian/changelog 2023-10-13 14:52:51.000000000 +0000 +++ linux-generate-azure-6.5-6.5.0/debian/changelog 2023-11-21 19:04:40.000000000 +0000 @@ -1,3 +1,28 @@ +linux-generate-azure-6.5 (6.5.0-1010.10~22.04.1) jammy; urgency=medium + + * Master version: 6.5.0-1010.10~22.04.1 + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Tim Gardner Tue, 21 Nov 2023 12:04:40 -0700 + +linux-generate-azure-6.5 (6.5.0-1009.9~22.04.1) jammy; urgency=medium + + * Master version: 6.5.0-1009.9~22.04.1 + + * Packaging resync (LP: #1786013) + - [Packaging] resync git-ubuntu-log + + * SIGNEDv5: add ubuntu-core-initrd support to the linux-generate ancillary + package (LP: #2027818) + - [Packaging] convert to v5.1 autogen form + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Tim Gardner Tue, 07 Nov 2023 06:32:44 -0700 + linux-generate-azure-6.5 (6.5.0-1007.7~22.04.1) jammy; urgency=medium * Master version: 6.5.0-1007.7~22.04.1 diff -Nru linux-generate-azure-6.5-6.5.0/debian/control linux-generate-azure-6.5-6.5.0/debian/control --- linux-generate-azure-6.5-6.5.0/debian/control 2023-10-13 14:52:51.000000000 +0000 +++ linux-generate-azure-6.5-6.5.0/debian/control 2023-11-21 19:04:40.000000000 +0000 @@ -7,9 +7,12 @@ lsb-release, python3, python3-apt, - sbsigntool, - linux-image-unsigned-6.5.0-1007-azure (= 6.5.0-1007.7~22.04.1) [amd64 arm64], - linux-buildinfo-6.5.0-1007-azure (= 6.5.0-1007.7~22.04.1) [amd64 arm64], +Build-Depends-Arch: + linux-image-unsigned-6.5.0-1010-azure (= 6.5.0-1010.10~22.04.1) [amd64 arm64], + linux-buildinfo-6.5.0-1010-azure (= 6.5.0-1010.10~22.04.1) [amd64 arm64], + ubuntu-core-initramfs [amd64], + sbsigntool [amd64 arm64], + openssl, Standards-Version: 3.9.4 Package: linux-generate-azure-6.5 diff -Nru linux-generate-azure-6.5-6.5.0/debian/control.common linux-generate-azure-6.5-6.5.0/debian/control.common --- linux-generate-azure-6.5-6.5.0/debian/control.common 2023-10-13 14:52:51.000000000 +0000 +++ linux-generate-azure-6.5-6.5.0/debian/control.common 2023-11-21 19:04:40.000000000 +0000 @@ -7,7 +7,10 @@ lsb-release, python3, python3-apt, - sbsigntool, - linux-image-unsigned-6.5.0-1007-azure (= 6.5.0-1007.7~22.04.1) [amd64 arm64], - linux-buildinfo-6.5.0-1007-azure (= 6.5.0-1007.7~22.04.1) [amd64 arm64], +Build-Depends-Arch: + linux-image-unsigned-6.5.0-1010-azure (= 6.5.0-1010.10~22.04.1) [amd64 arm64], + linux-buildinfo-6.5.0-1010-azure (= 6.5.0-1010.10~22.04.1) [amd64 arm64], + ubuntu-core-initramfs [amd64], + sbsigntool [amd64 arm64], + openssl, Standards-Version: 3.9.4 diff -Nru linux-generate-azure-6.5-6.5.0/debian/files.json linux-generate-azure-6.5-6.5.0/debian/files.json --- linux-generate-azure-6.5-6.5.0/debian/files.json 2023-10-13 14:52:51.000000000 +0000 +++ linux-generate-azure-6.5-6.5.0/debian/files.json 2023-11-21 19:04:40.000000000 +0000 @@ -2,14 +2,19 @@ "linux-generate-azure-6.5": { "files": [ { - "sig_type": "efi", - "file": "/boot/vmlinuz-6.5.0-1007-azure", - "arch": "amd64" + "arch": "amd64", + "file": "/boot/kernel.efi-6.5.0-1010-azure", + "sig_type": "efi" }, { - "sig_type": "efi", - "file": "/boot/vmlinuz-6.5.0-1007-azure", - "arch": "arm64" + "arch": "amd64", + "file": "/boot/vmlinuz-6.5.0-1010-azure", + "sig_type": "efi" + }, + { + "arch": "arm64", + "file": "/boot/vmlinuz-6.5.0-1010-azure", + "sig_type": "efi" } ] } diff -Nru linux-generate-azure-6.5-6.5.0/debian/rules.gen linux-generate-azure-6.5-6.5.0/debian/rules.gen --- linux-generate-azure-6.5-6.5.0/debian/rules.gen 2023-10-13 14:52:51.000000000 +0000 +++ linux-generate-azure-6.5-6.5.0/debian/rules.gen 2023-11-21 19:04:40.000000000 +0000 @@ -26,9 +26,13 @@ custom_dir=$(custom_top)/$(version) custom_tar=$(source)_$(version)_$(arch).tar.gz .PHONY: custom-upload +snapd_info=$(firstword $(wildcard /usr/lib/ubuntu-core-initramfs/main/usr/lib/snapd/info /usr/lib/snapd/info)) custom-upload: install -d $(custom_dir)/control { echo "tarball"; } >$(custom_dir)/control/options +ifneq (,$(snapd_info)) + cp $(snapd_info) $(custom_dir)/snapd-info +endif cd $(custom_top) && tar czvf ../../../$(custom_tar) . dpkg-distaddfile $(custom_tar) raw-signing - @@ -38,14 +42,19 @@ .PHONY: generate-amd64 generate-amd64:: install -d $(custom_dir)/boot - $(call copy_or_download,/boot/vmlinuz-6.5.0-1007-azure,$(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi) + $(call copy_or_download,/boot/kernel.efi-6.5.0-1010-azure,$(custom_dir)/boot/kernel.efi-6.5.0-1010-azure.efi) + +.PHONY: generate-amd64 +generate-amd64:: + install -d $(custom_dir)/boot + $(call copy_or_download,/boot/vmlinuz-6.5.0-1010-azure,$(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi) .PHONY: generate-arm64 generate-arm64:: install -d $(custom_dir)/boot - $(call copy_or_download,/boot/vmlinuz-6.5.0-1007-azure,$(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi) - if [ $$(file --brief --mime-type "$(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi") = "application/gzip" ]; then \ - gunzip -cv <$(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi >$(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi.gunzip; \ - mv -f $(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi.gunzip $(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi; \ - echo "GZIP=1" >>$(custom_dir)/boot/vmlinuz-6.5.0-1007-azure.efi.vars; \ + $(call copy_or_download,/boot/vmlinuz-6.5.0-1010-azure,$(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi) + if [ $$(file --brief --mime-type "$(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi") = "application/gzip" ]; then \ + gunzip -cv <$(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi >$(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi.gunzip; \ + mv -f $(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi.gunzip $(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi; \ + echo "GZIP=1" >>$(custom_dir)/boot/vmlinuz-6.5.0-1010-azure.efi.vars; \ fi; \ diff -Nru linux-generate-azure-6.5-6.5.0/debian/scripts/gen-rules linux-generate-azure-6.5-6.5.0/debian/scripts/gen-rules --- linux-generate-azure-6.5-6.5.0/debian/scripts/gen-rules 2023-10-10 19:27:30.000000000 +0000 +++ linux-generate-azure-6.5-6.5.0/debian/scripts/gen-rules 2023-11-06 13:38:07.000000000 +0000 @@ -76,9 +76,13 @@ custom_dir=$(custom_top)/$(version) custom_tar=$(source)_$(version)_$(arch).tar.gz .PHONY: custom-upload + snapd_info=$(firstword $(wildcard /usr/lib/ubuntu-core-initramfs/main/usr/lib/snapd/info /usr/lib/snapd/info)) custom-upload: install -d $(custom_dir)/control { echo "tarball"; } >$(custom_dir)/control/options + ifneq (,$(snapd_info)) + cp $(snapd_info) $(custom_dir)/snapd-info + endif cd $(custom_top) && tar czvf ../../../$(custom_tar) . dpkg-distaddfile $(custom_tar) raw-signing -