Merge pull request #10397 from fidencio/topic/build-remove-initrd-mariner-target

build: mariner: Remove the ability to build the marine initrd
This commit is contained in:
Fabiano Fidêncio 2024-10-10 09:44:36 +02:00 committed by GitHub
commit 036b04094e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 15 deletions

View File

@ -37,7 +37,6 @@ BASE_SERIAL_TARBALLS = rootfs-image-tarball \
rootfs-image-confidential-tarball \
rootfs-image-mariner-tarball \
rootfs-initrd-confidential-tarball \
rootfs-initrd-mariner-tarball \
rootfs-initrd-tarball \
cloud-hypervisor-tarball \
cloud-hypervisor-glibc-tarball
@ -153,9 +152,6 @@ rootfs-image-confidential-tarball: agent-tarball pause-image-tarball coco-guest-
rootfs-image-mariner-tarball: agent-tarball
${MAKE} $@-build
rootfs-initrd-mariner-tarball: agent-tarball
${MAKE} $@-build
rootfs-initrd-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball
${MAKE} $@-build

View File

@ -121,7 +121,6 @@ options:
rootfs-image-mariner
rootfs-initrd
rootfs-initrd-confidential
rootfs-initrd-mariner
runk
shim-v2
trace-forwarder
@ -418,11 +417,6 @@ install_initrd_confidential() {
install_initrd "confidential"
}
#Install Mariner guest initrd
install_initrd_mariner() {
install_initrd "mariner"
}
#Instal NVIDIA GPU image
install_image_nvidia_gpu() {
export AGENT_POLICY="yes"
@ -1098,8 +1092,6 @@ handle_build() {
rootfs-initrd-confidential) install_initrd_confidential ;;
rootfs-initrd-mariner) install_initrd_mariner ;;
rootfs-nvidia-gpu-image) install_image_nvidia_gpu ;;
rootfs-nvidia-gpu-initrd) install_initrd_nvidia_gpu ;;

View File

@ -184,9 +184,6 @@ assets:
confidential:
name: *glibc-initrd-name
version: *glibc-initrd-version
mariner:
name: "cbl-mariner"
version: "2.0"
nvidia-gpu:
name: *glibc-initrd-name
version: "jammy"