github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-12 05:12:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kata-deploy/local-build/Makefile
View File

@ -37,7 +37,6 @@ BASE_SERIAL_TARBALLS = rootfs-image-tarball \
rootfs-image-confidential-tarball \ rootfs-image-confidential-tarball \
rootfs-image-mariner-tarball \ rootfs-image-mariner-tarball \
rootfs-initrd-confidential-tarball \ rootfs-initrd-confidential-tarball \
rootfs-initrd-mariner-tarball \
rootfs-initrd-tarball \ rootfs-initrd-tarball \
cloud-hypervisor-tarball \ cloud-hypervisor-tarball \
cloud-hypervisor-glibc-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 rootfs-image-mariner-tarball: agent-tarball
${MAKE} $@-build ${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 rootfs-initrd-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball
${MAKE} $@-build ${MAKE} $@-build

8
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

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

3
versions.yaml
View File

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