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

image: downgrade systemd to 251.11-2 (#1369)

Browse Source
This commit is contained in:
Malte Poll 2023-03-08 10:45:53 +01:00 committed by GitHub
parent 262e5674a2
commit ac94e01642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
image/Makefile
View File

@ -18,8 +18,10 @@ export CONSOLE_MOTD = $(AUTOLOGIN)
csps := aws azure gcp openstack qemu
certs := $(PKI)/PK.cer $(PKI)/KEK.cer $(PKI)/db.cer
SYSTEMD_FIXED_RPMS := systemd-251.11-2.fc37.x86_64.rpm systemd-libs-251.11-2.fc37.x86_64.rpm systemd-networkd-251.11-2.fc37.x86_64.rpm systemd-pam-251.11-2.fc37.x86_64.rpm systemd-resolved-251.11-2.fc37.x86_64.rpm systemd-udev-251.11-2.fc37.x86_64.rpm
AZURE_FIXED_KERNEL_RPMS := kernel-6.1.14-200.fc37.x86_64.rpm kernel-core-6.1.14-200.fc37.x86_64.rpm kernel-modules-6.1.14-200.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
PREBUILD_RPMS_SYSTEMD := $(addprefix prebuilt/rpms/systemd/,$(SYSTEMD_FIXED_RPMS))
PREBUILT_RPMS_AZURE := $(addprefix prebuilt/rpms/azure/,$(AZURE_FIXED_KERNEL_RPMS))
PREBUILT_RPMS_GCP := $(addprefix prebuilt/rpms/gcp/,$(GCP_FIXED_KERNEL_RPMS))
@ -29,6 +31,11 @@ all: $(csps)
$(csps): %: mkosi.output.%/fedora~37/image.raw
prebuilt/rpms/systemd/%.rpm:
@echo "Downloading $*"
@mkdir -p $(@D)
@curl -fsSL -o $@ https://kojipkgs.fedoraproject.org/packages/systemd/251.11/2.fc37/x86_64/$*.rpm
prebuilt/rpms/gcp/%.rpm:
@echo "Downloading $*"
@mkdir -p $(@D)
@ -53,7 +60,7 @@ mkosi.output.%/fedora~37/image.raw: mkosi.files/mkosi.%.conf inject-bins inject-
fi
@echo "Image is ready: $@"
inject-bins: $(PREBUILT_RPMS_AZURE) $(PREBUILT_RPMS_GCP)
inject-bins: $(PREBUILD_RPMS_SYSTEMD) $(PREBUILT_RPMS_AZURE) $(PREBUILT_RPMS_GCP)
mkdir -p $(MKOSI_EXTRA)/usr/bin
mkdir -p $(MKOSI_EXTRA)/usr/sbin
cp $(UPGRADE_AGENT_BINARY) $(MKOSI_EXTRA)/usr/bin/upgrade-agent

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

@ -20,5 +20,16 @@ SecureBootCertificate=pki/db.crt
ImageId=constellation
Output=image.raw
[Content]
BasePackages=conditional
Packages=prebuilt/rpms/systemd/systemd-251.11-2.fc37.x86_64.rpm
prebuilt/rpms/systemd/systemd-libs-251.11-2.fc37.x86_64.rpm
prebuilt/rpms/systemd/systemd-networkd-251.11-2.fc37.x86_64.rpm
prebuilt/rpms/systemd/systemd-pam-251.11-2.fc37.x86_64.rpm
prebuilt/rpms/systemd/systemd-resolved-251.11-2.fc37.x86_64.rpm
prebuilt/rpms/systemd/systemd-udev-251.11-2.fc37.x86_64.rpm
util-linux
dracut
[Host]
QemuHeadless=yes

1
image/mkosi.conf.d/secure-boot-tpm.conf
View File

@ -6,4 +6,3 @@ Packages=
efitools,
mokutil,
tpm2-tools,
systemd-boot-unsigned,

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

@ -1,3 +1,9 @@
[Output]
KernelCommandLine=constel.csp=aws constel.attestation-variant=aws-nitro-tpm
OutputDirectory=mkosi.output.aws
[Content]
BasePackages=conditional
Packages=kernel
kernel-core
kernel-modules

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

@ -5,9 +5,6 @@ OutputDirectory=mkosi.output.azure
# replace kernel
[Content]
BasePackages=conditional
Packages=systemd
util-linux
dracut
prebuilt/rpms/azure/kernel-6.1.14-200.fc37.x86_64.rpm
Packages=prebuilt/rpms/azure/kernel-6.1.14-200.fc37.x86_64.rpm
prebuilt/rpms/azure/kernel-core-6.1.14-200.fc37.x86_64.rpm
prebuilt/rpms/azure/kernel-modules-6.1.14-200.fc37.x86_64.rpm

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

@ -5,9 +5,6 @@ OutputDirectory=mkosi.output.gcp
# replace kernel
[Content]
BasePackages=conditional
Packages=systemd
util-linux
dracut
prebuilt/rpms/gcp/kernel-5.19.17-300.fc37.x86_64.rpm
Packages=prebuilt/rpms/gcp/kernel-5.19.17-300.fc37.x86_64.rpm
prebuilt/rpms/gcp/kernel-core-5.19.17-300.fc37.x86_64.rpm
prebuilt/rpms/gcp/kernel-modules-5.19.17-300.fc37.x86_64.rpm

4
image/mkosi.files/mkosi.openstack.conf
View File

@ -5,3 +5,7 @@ OutputDirectory=mkosi.output.openstack
[Content]
Autologin=yes
Environment=CONSOLE_MOTD=true
BasePackages=conditional
Packages=kernel
kernel-core
kernel-modules

4
image/mkosi.files/mkosi.qemu.conf
View File

@ -5,3 +5,7 @@ OutputDirectory=mkosi.output.qemu
[Content]
Autologin=yes
Environment=CONSOLE_MOTD=true
BasePackages=conditional
Packages=kernel
kernel-core
kernel-modules