From 28663d4772f60db513c56e95f39f57a5451d8bdb Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Wed, 8 Nov 2023 21:20:13 +0000 Subject: [PATCH] tree: import changes from testing-devel at f97b3f0e6b47f31c920c9e12f66d46b7625a9925 --- manifests/crun-wasm.yaml | 4 ---- manifests/fedora-coreos-base.yaml | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 manifests/crun-wasm.yaml diff --git a/manifests/crun-wasm.yaml b/manifests/crun-wasm.yaml deleted file mode 100644 index e9700c6bdc..0000000000 --- a/manifests/crun-wasm.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# for podman experimentation: -# https://github.com/coreos/fedora-coreos-tracker/issues/1375 -packages: - - crun-wasm wasmedge-rt diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index 8a4f83f3d9..f81e687999 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -174,14 +174,16 @@ packages: # - Include this on non-x86_64 FCOS images to allow access to the large # inventory of containers only built for x86_64. # https://github.com/coreos/fedora-coreos-tracker/issues/1237 -# # - google-compute-engine-guest-configs-udev # - Add this package on x86_64 and aarch64 (the two architectures # GCP supports. https://github.com/coreos/fedora-coreos-tracker/issues/1494 # This should be moved to a shared manifest when RHEL has this package. +# - crun-wasm wasmedge-rt +# - Support for wasm runtime: https://github.com/coreos/fedora-coreos-tracker/issues/1375 packages-x86_64: - irqbalance - google-compute-engine-guest-configs-udev + - crun-wasm wasmedge-rt packages-ppc64le: - irqbalance - librtas @@ -192,6 +194,7 @@ packages-aarch64: - irqbalance - qemu-user-static-x86 - google-compute-engine-guest-configs-udev + - crun-wasm wasmedge-rt packages-s390x: - qemu-user-static-x86