Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-23 08:20:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade azure kernel to 5.19.4 (#862)

Browse Source
This commit is contained in:
Malte Poll 2023-01-04 17:48:27 +01:00 committed by GitHub
parent f9458950cb
commit 25eaff26ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
image/Makefile
View File

@ -11,8 +11,10 @@ IMAGE_VERSION ?= v0.0.0
csps := aws qemu gcp azure csps := aws qemu gcp azure
certs := $(PKI)/PK.cer $(PKI)/KEK.cer $(PKI)/db.cer 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
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 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 := $(addprefix prebuilt/rpms/,$(GCP_FIXED_KERNEL_RPMS)) PREBUILT_RPMS_AZURE := $(addprefix prebuilt/rpms/azure/,$(AZURE_FIXED_KERNEL_RPMS))
PREBUILT_RPMS_GCP := $(addprefix prebuilt/rpms/gcp/,$(GCP_FIXED_KERNEL_RPMS))
.PHONY: all clean inject-bins $(csps) .PHONY: all clean inject-bins $(csps)
@ -20,11 +22,16 @@ all: $(csps)
$(csps): %: mkosi.output.%/fedora~37/image.raw $(csps): %: mkosi.output.%/fedora~37/image.raw
prebuilt/rpms/%.rpm: prebuilt/rpms/gcp/%.rpm:
@echo "Downloading $*" @echo "Downloading $*"
@mkdir -p $(@D) @mkdir -p $(@D)
@curl -sL -o $@ https://kojipkgs.fedoraproject.org/packages/kernel/5.19.17/300.fc37/x86_64/$*.rpm @curl -sL -o $@ https://kojipkgs.fedoraproject.org/packages/kernel/5.19.17/300.fc37/x86_64/$*.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
mkosi.output.%/fedora~37/image.raw: mkosi.files/mkosi.%.conf inject-bins inject-certs 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 mkosi --config mkosi.files/mkosi.$*.conf --image-version=$(IMAGE_VERSION) build
secure-boot/signed-shim.sh $@ secure-boot/signed-shim.sh $@
@ -33,7 +40,7 @@ mkosi.output.%/fedora~37/image.raw: mkosi.files/mkosi.%.conf inject-bins inject-
fi fi
@echo "Image is ready: $@" @echo "Image is ready: $@"
inject-bins: $(PREBUILT_RPMS) inject-bins: $(PREBUILT_RPMS_AZURE) $(PREBUILT_RPMS_GCP)
mkdir -p $(MKOSI_EXTRA)/usr/bin mkdir -p $(MKOSI_EXTRA)/usr/bin
mkdir -p $(MKOSI_EXTRA)/usr/sbin mkdir -p $(MKOSI_EXTRA)/usr/sbin
cp $(BOOTSTRAPPER_BINARY) $(MKOSI_EXTRA)/usr/bin/bootstrapper cp $(BOOTSTRAPPER_BINARY) $(MKOSI_EXTRA)/usr/bin/bootstrapper
@ -61,5 +68,6 @@ clean-%:
clean: clean:
rm -rf mkosi.output.* rm -rf mkosi.output.*
rm -rf prebuilt/rpms
rm -rf $(MKOSI_EXTRA) rm -rf $(MKOSI_EXTRA)
mkdir -p $(MKOSI_EXTRA) mkdir -p $(MKOSI_EXTRA)

2
image/mkosi.conf.d/mkosi.conf
View File

@ -6,7 +6,7 @@ Release=37
Format=gpt_squashfs Format=gpt_squashfs
ManifestFormat=json,changelog ManifestFormat=json,changelog
Bootable=yes Bootable=yes
KernelCommandLine=mitigations=auto,nosmt preempt=full KernelCommandLine=mitigations=auto,nosmt preempt=full loglevel=8
WithUnifiedKernelImages=yes WithUnifiedKernelImages=yes
Verity=yes Verity=yes
CompressFs=zstd CompressFs=zstd

10
image/mkosi.files/mkosi.azure.conf
View File

@ -1,3 +1,13 @@
[Output] [Output]
KernelCommandLine=constel.csp=azure KernelCommandLine=constel.csp=azure
OutputDirectory=mkosi.output.azure OutputDirectory=mkosi.output.azure
# replace kernel
[Content]
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

6
image/mkosi.files/mkosi.gcp.conf
View File

@ -8,6 +8,6 @@ BasePackages=conditional
Packages=systemd Packages=systemd
util-linux util-linux
dracut dracut
prebuilt/rpms/kernel-5.19.17-300.fc37.x86_64.rpm prebuilt/rpms/gcp/kernel-5.19.17-300.fc37.x86_64.rpm
prebuilt/rpms/kernel-core-5.19.17-300.fc37.x86_64.rpm prebuilt/rpms/gcp/kernel-core-5.19.17-300.fc37.x86_64.rpm
prebuilt/rpms/kernel-modules-5.19.17-300.fc37.x86_64.rpm prebuilt/rpms/gcp/kernel-modules-5.19.17-300.fc37.x86_64.rpm