From eb9d29022bf5a9d9bd1a941853d3b046fe8f4408 Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Wed, 4 Oct 2023 19:00:05 +0000 Subject: [PATCH 1/2] tree: promote changes from next-devel at fe3d00224dbcc55e5c09e8f30c2356d72db1bc78 --- manifest-lock.aarch64.json | 12 ++++++++++++ manifest-lock.overrides.yaml | 28 ++++++++++++++++++++-------- manifest-lock.x86_64.json | 12 ++++++++++++ manifests/crun-wasm.yaml | 4 ++++ 4 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 manifests/crun-wasm.yaml diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json index 89c18c902c..8ac4120171 100644 --- a/manifest-lock.aarch64.json +++ b/manifest-lock.aarch64.json @@ -189,6 +189,9 @@ "crun": { "evra": "1.9-1.fc39.aarch64" }, + "crun-wasm": { + "evra": "1.9-1.fc39.aarch64" + }, "crypto-policies": { "evra": "20230731-1.git5ed06e0.fc39.noarch" }, @@ -327,6 +330,9 @@ "flatpak-session-helper": { "evra": "1.15.4-3.fc39.aarch64" }, + "fmt": { + "evra": "10.0.0-3.fc39.aarch64" + }, "fstrm": { "evra": "0.6.1-8.fc39.aarch64" }, @@ -1149,6 +1155,9 @@ "socat": { "evra": "1.7.4.4-3.fc39.aarch64" }, + "spdlog": { + "evra": "1.12.0-2.fc39.aarch64" + }, "sqlite-libs": { "evra": "3.42.0-7.fc39.aarch64" }, @@ -1242,6 +1251,9 @@ "vim-minimal": { "evra": "2:9.0.1927-1.fc39.aarch64" }, + "wasmedge-rt": { + "evra": "0.13.3-1.fc39.aarch64" + }, "which": { "evra": "2.21-40.fc39.aarch64" }, diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml index c5b5743eb2..1e91a953bd 100644 --- a/manifest-lock.overrides.yaml +++ b/manifest-lock.overrides.yaml @@ -14,15 +14,27 @@ packages: metadata: reason: https://github.com/coreos/fedora-coreos-tracker/issues/1578 type: pin - podman: - evr: 5:4.7.0-1.fc39 + glibc: + evr: 2.38-6.fc39 metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-73f739ce37 - reason: https://github.com/containers/podman/releases/tag/v4.7.0 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 type: fast-track - podman-plugins: - evr: 5:4.7.0-1.fc39 + glibc-common: + evr: 2.38-6.fc39 metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-73f739ce37 - reason: https://github.com/containers/podman/releases/tag/v4.7.0 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 + type: fast-track + glibc-gconv-extra: + evr: 2.38-6.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 + type: fast-track + glibc-minimal-langpack: + evr: 2.38-6.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 type: fast-track diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json index 24dfb3e412..f246e5bd17 100644 --- a/manifest-lock.x86_64.json +++ b/manifest-lock.x86_64.json @@ -189,6 +189,9 @@ "crun": { "evra": "1.9-1.fc39.x86_64" }, + "crun-wasm": { + "evra": "1.9-1.fc39.x86_64" + }, "crypto-policies": { "evra": "20230731-1.git5ed06e0.fc39.noarch" }, @@ -327,6 +330,9 @@ "flatpak-session-helper": { "evra": "1.15.4-3.fc39.x86_64" }, + "fmt": { + "evra": "10.0.0-3.fc39.x86_64" + }, "fstrm": { "evra": "0.6.1-8.fc39.x86_64" }, @@ -1152,6 +1158,9 @@ "socat": { "evra": "1.7.4.4-3.fc39.x86_64" }, + "spdlog": { + "evra": "1.12.0-2.fc39.x86_64" + }, "sqlite-libs": { "evra": "3.42.0-7.fc39.x86_64" }, @@ -1245,6 +1254,9 @@ "vim-minimal": { "evra": "2:9.0.1927-1.fc39.x86_64" }, + "wasmedge-rt": { + "evra": "0.13.3-1.fc39.x86_64" + }, "which": { "evra": "2.21-40.fc39.x86_64" }, diff --git a/manifests/crun-wasm.yaml b/manifests/crun-wasm.yaml new file mode 100644 index 0000000000..e9700c6bdc --- /dev/null +++ b/manifests/crun-wasm.yaml @@ -0,0 +1,4 @@ +# for podman experimentation: +# https://github.com/coreos/fedora-coreos-tracker/issues/1375 +packages: + - crun-wasm wasmedge-rt From 0cced3ada2997bf848950cb7912a37b7d9d2f719 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 4 Oct 2023 09:40:44 -0400 Subject: [PATCH 2/2] manifest: include crun-wasm and wasmedge-rt We want to ship this in `next` for now to allow podman machines to make use of it. We may either promote it to all streams (if there are more people asking for it) or remove it at some point in the future (once podman machines move to a layering model). Closes: https://github.com/coreos/fedora-coreos-tracker/issues/1375 (cherry picked from commit 3d690fad16f5d812df405757c9b2e816193a9518) --- manifest.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifest.yaml b/manifest.yaml index 49e48dcc07..ae5a10af70 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -5,3 +5,11 @@ variables: releasever: 39 include: manifests/fedora-coreos.yaml + +conditional-include: + # we only want these in next for now; see + # https://github.com/coreos/fedora-coreos-tracker/issues/1375 + - if: basearch == "x86_64" + include: manifests/crun-wasm.yaml + - if: basearch == "aarch64" + include: manifests/crun-wasm.yaml