From 1e9cd7422b7f79db2e5fc5292e97cc2cbd4ef97a Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 25 Oct 2023 23:27:43 -0400
Subject: [PATCH] manifests: include wasm packages in fedora-coreos-base
 manifest

It's a bit confusing to folks that this didn't make it into the
testing and stable streams [1]. Let's just include them on all
streams like we agreed to originally.

[1] https://github.com/coreos/fedora-coreos-tracker/issues/1375#issuecomment-1750114083
---
 manifest-lock.aarch64.json        | 12 ++++++++++++
 manifest-lock.x86_64.json         | 12 ++++++++++++
 manifests/crun-wasm.yaml          |  4 ----
 manifests/fedora-coreos-base.yaml |  5 ++++-
 4 files changed, 28 insertions(+), 5 deletions(-)
 delete mode 100644 manifests/crun-wasm.yaml

diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json
index d6dadebf0f..c39ff5d365 100644
--- a/manifest-lock.aarch64.json
+++ b/manifest-lock.aarch64.json
@@ -195,6 +195,9 @@
     "crun-wasm": {
       "evra": "1.11.1-1.fc39.aarch64"
     },
+    "crun-wasm": {
+      "evra": "1.10-1.fc38.aarch64"
+    },
     "crypto-policies": {
       "evra": "20230731-1.git5ed06e0.fc39.noarch"
     },
@@ -336,6 +339,9 @@
     "fmt": {
       "evra": "10.0.0-3.fc39.aarch64"
     },
+    "fmt": {
+      "evra": "9.1.0-2.fc38.aarch64"
+    },
     "fstrm": {
       "evra": "0.6.1-8.fc39.aarch64"
     },
@@ -1158,6 +1164,9 @@
     "spdlog": {
       "evra": "1.12.0-2.fc39.aarch64"
     },
+    "spdlog": {
+      "evra": "1.11.0-5.fc38.aarch64"
+    },
     "sqlite-libs": {
       "evra": "3.42.0-7.fc39.aarch64"
     },
@@ -1254,6 +1263,9 @@
     "wasmedge-rt": {
       "evra": "0.13.4-1.fc39.aarch64"
     },
+    "wasmedge-rt": {
+      "evra": "0.13.4-2.fc38.aarch64"
+    },
     "which": {
       "evra": "2.21-40.fc39.aarch64"
     },
diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index 3e85f0dcb5..1942178a49 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -195,6 +195,9 @@
     "crun-wasm": {
       "evra": "1.11.1-1.fc39.x86_64"
     },
+    "crun-wasm": {
+      "evra": "1.10-1.fc38.x86_64"
+    },
     "crypto-policies": {
       "evra": "20230731-1.git5ed06e0.fc39.noarch"
     },
@@ -336,6 +339,9 @@
     "fmt": {
       "evra": "10.0.0-3.fc39.x86_64"
     },
+    "fmt": {
+      "evra": "9.1.0-2.fc38.x86_64"
+    },
     "fstrm": {
       "evra": "0.6.1-8.fc39.x86_64"
     },
@@ -1161,6 +1167,9 @@
     "spdlog": {
       "evra": "1.12.0-2.fc39.x86_64"
     },
+    "spdlog": {
+      "evra": "1.11.0-5.fc38.x86_64"
+    },
     "sqlite-libs": {
       "evra": "3.42.0-7.fc39.x86_64"
     },
@@ -1257,6 +1266,9 @@
     "wasmedge-rt": {
       "evra": "0.13.4-1.fc39.x86_64"
     },
+    "wasmedge-rt": {
+      "evra": "0.13.4-2.fc38.x86_64"
+    },
     "which": {
       "evra": "2.21-40.fc39.x86_64"
     },
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