diff --git a/image/Makefile b/image/Makefile index f338fd675..fd645c314 100644 --- a/image/Makefile +++ b/image/Makefile @@ -10,7 +10,7 @@ IMAGE_VERSION ?= v0.0.0 csps := aws qemu gcp azure certs := $(PKI)/PK.cer $(PKI)/KEK.cer $(PKI)/db.cer -AZURE_FIXED_KERNEL_RPMS := kernel-5.19.4-300.fc37.x86_64.rpm kernel-core-5.19.4-300.fc37.x86_64.rpm kernel-modules-5.19.4-300.fc37.x86_64.rpm +AZURE_FIXED_KERNEL_RPMS := kernel-6.0.17-300.fc37.x86_64.rpm kernel-core-6.0.17-300.fc37.x86_64.rpm kernel-modules-6.0.17-300.fc37.x86_64.rpm 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 PREBUILT_RPMS_AZURE := $(addprefix prebuilt/rpms/azure/,$(AZURE_FIXED_KERNEL_RPMS)) PREBUILT_RPMS_GCP := $(addprefix prebuilt/rpms/gcp/,$(GCP_FIXED_KERNEL_RPMS)) @@ -29,7 +29,7 @@ prebuilt/rpms/gcp/%.rpm: prebuilt/rpms/azure/%.rpm: @echo "Downloading $*" @mkdir -p $(@D) - @curl -sL -o $@ https://kojipkgs.fedoraproject.org/packages/kernel/5.19.4/300.fc37/x86_64/$*.rpm + @curl -sL -o $@ https://cdn.confidential.cloud/constellation/testing/kernel/dogfooding/$*.rpm mkosi.output.%/fedora~37/image.raw: mkosi.files/mkosi.%.conf inject-bins inject-certs mkosi --config mkosi.files/mkosi.$*.conf --image-version=$(IMAGE_VERSION) build diff --git a/image/mkosi.files/mkosi.azure.conf b/image/mkosi.files/mkosi.azure.conf index bc81fda0a..d32328a58 100644 --- a/image/mkosi.files/mkosi.azure.conf +++ b/image/mkosi.files/mkosi.azure.conf @@ -1,5 +1,5 @@ [Output] -KernelCommandLine=constel.csp=azure +KernelCommandLine=constel.csp=azure nopat OutputDirectory=mkosi.output.azure # replace kernel @@ -8,6 +8,6 @@ BasePackages=conditional Packages=systemd util-linux dracut - prebuilt/rpms/azure/kernel-5.19.4-300.fc37.x86_64.rpm - prebuilt/rpms/azure/kernel-core-5.19.4-300.fc37.x86_64.rpm - prebuilt/rpms/azure/kernel-modules-5.19.4-300.fc37.x86_64.rpm + prebuilt/rpms/azure/kernel-6.0.17-300.fc37.x86_64.rpm + prebuilt/rpms/azure/kernel-core-6.0.17-300.fc37.x86_64.rpm + prebuilt/rpms/azure/kernel-modules-6.0.17-300.fc37.x86_64.rpm