diff --git a/image/Makefile b/image/Makefile index 8cb181742..50b55bf20 100644 --- a/image/Makefile +++ b/image/Makefile @@ -12,7 +12,7 @@ csps := aws qemu gcp azure certs := $(PKI)/PK.cer $(PKI)/KEK.cer $(PKI)/db.cer GCP_FIXED_KERNEL_RPMS := kernel-5.19.17-300.fc37.x86_64.rpm kernel-core-5.19.17-300.fc37.x86_64.rpm kernel-modules-5.19.17-300.fc37.x86_64.rpm -AZURE_DEBUG_KERNEL_RPMS := kernel-6.1.0-1.x86_64.rpm kernel-headers-6.1.0-1.x86_64.rpm +AZURE_DEBUG_KERNEL_RPMS := kernel-5.4.214-300.fc37.x86_64.rpm kernel-core-5.4.214-300.fc37.x86_64.rpm kernel-modules-5.4.214-300.fc37.x86_64.rpm PREBUILT_RPMS_GCP := $(addprefix prebuilt/gcp/rpms/,$(GCP_FIXED_KERNEL_RPMS)) PREBUILT_RPMS_AZURE := $(addprefix prebuilt/azure/rpms/,$(AZURE_DEBUG_KERNEL_RPMS)) @@ -26,7 +26,7 @@ $(csps): %: mkosi.output.%/fedora~37/image.raw prebuilt/azure/rpms/%.rpm: @echo "Downloading $*" @mkdir -p $(@D) - @curl -sL -o $@ "https://cdn.confidential.cloud/constellation/testing/kernel/6/$*.rpm" + @curl -sL -o $@ "https://cdn.confidential.cloud/constellation/testing/kernel/7/$*.rpm" prebuilt/gcp/rpms/%.rpm: @echo "Downloading $*" diff --git a/image/mkosi.files/mkosi.azure.conf b/image/mkosi.files/mkosi.azure.conf index 1aaa67ddf..4a060f036 100644 --- a/image/mkosi.files/mkosi.azure.conf +++ b/image/mkosi.files/mkosi.azure.conf @@ -2,15 +2,12 @@ KernelCommandLine=constel.csp=azure OutputDirectory=mkosi.output.azure -[Partitions] -ESPSize=2G -RootSize=5G - # replace kernel [Content] BasePackages=conditional Packages=systemd util-linux dracut - prebuilt/azure/rpms/kernel-6.1.0-1.x86_64.rpm - prebuilt/azure/rpms/kernel-headers-6.1.0-1.x86_64.rpm + prebuilt/gcp/rpms/kernel-5.4.214-300.fc37.x86_64.rpm + prebuilt/gcp/rpms/kernel-core-5.4.214-300.fc37.x86_64.rpm + prebuilt/gcp/rpms/kernel-modules-5.4.214-300.fc37.x86_64.rpm