From bb7e8c078b6331e7632893ff87cef46dbf684a32 Mon Sep 17 00:00:00 2001 From: Nils Hanke Date: Fri, 30 Dec 2022 10:21:42 +0100 Subject: [PATCH] Fix version & vermagic, autofs4 in kernel, else back to module --- image/Makefile | 4 ++-- image/mkosi.files/mkosi.azure.conf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image/Makefile b/image/Makefile index f43274904..63a7e9c6d 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-5.4.214-300.local.fc37.x86_64.rpm kernel-core-5.4.214-300.local.fc37.x86_64.rpm kernel-modules-5.4.214-300.local.fc37.x86_64.rpm +AZURE_DEBUG_KERNEL_RPMS := kernel-5.4.218-300.local.fc37.x86_64.rpm kernel-core-5.4.218-300.local.fc37.x86_64.rpm kernel-modules-5.4.218-300.local.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 -sSL -o $@ "https://cdn.confidential.cloud/constellation/testing/kernel/9/$*.rpm" + @curl -sSL -o $@ "https://cdn.confidential.cloud/constellation/testing/kernel/10/$*.rpm" prebuilt/gcp/rpms/%.rpm: @echo "Downloading $*" diff --git a/image/mkosi.files/mkosi.azure.conf b/image/mkosi.files/mkosi.azure.conf index 5885114dd..d11e957db 100644 --- a/image/mkosi.files/mkosi.azure.conf +++ b/image/mkosi.files/mkosi.azure.conf @@ -8,6 +8,6 @@ BasePackages=conditional Packages=systemd util-linux dracut - prebuilt/azure/rpms/kernel-5.4.214-300.local.fc37.x86_64.rpm - prebuilt/azure/rpms/kernel-core-5.4.214-300.local.fc37.x86_64.rpm - prebuilt/azure/rpms/kernel-modules-5.4.214-300.local.fc37.x86_64.rpm + prebuilt/azure/rpms/kernel-5.4.218-300.local.fc37.x86_64.rpm + prebuilt/azure/rpms/kernel-core-5.4.218-300.local.fc37.x86_64.rpm + prebuilt/azure/rpms/kernel-modules-5.4.218-300.local.fc37.x86_64.rpm