tree: promote changes from next-devel at c0a0942

coreos · Oct 9, 2023 · 900e07c · 900e07c
1 parent 5c4c9f7
commit 900e07c
Show file tree

Hide file tree

Showing 10 changed files with 212 additions and 133 deletions.
diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json
@@ -52,10 +52,10 @@
       "evra": "3.1.2-4.fc39.aarch64"
     },
     "authselect": {
-      "evra": "1.4.2-3.fc39.aarch64"
+      "evra": "1.4.3-1.fc39.aarch64"
     },
     "authselect-libs": {
-      "evra": "1.4.2-3.fc39.aarch64"
+      "evra": "1.4.3-1.fc39.aarch64"
     },
     "avahi-libs": {
       "evra": "0.8-24.fc39.aarch64"
@@ -73,13 +73,13 @@
       "evra": "1:2.11-12.fc39.noarch"
     },
     "bind-libs": {
-      "evra": "32:9.18.17-1.fc39.aarch64"
+      "evra": "32:9.18.19-1.fc39.aarch64"
     },
     "bind-license": {
-      "evra": "32:9.18.17-1.fc39.noarch"
+      "evra": "32:9.18.19-1.fc39.noarch"
     },
     "bind-utils": {
-      "evra": "32:9.18.17-1.fc39.aarch64"
+      "evra": "32:9.18.19-1.fc39.aarch64"
     },
     "bootupd": {
       "evra": "0.2.11-3.fc39.aarch64"
@@ -148,7 +148,7 @@
       "evra": "0.21.3-6.fc39.noarch"
     },
     "container-selinux": {
-      "evra": "2:2.221.1-1.fc39.noarch"
+      "evra": "2:2.222.0-1.fc39.noarch"
     },
     "containerd": {
       "evra": "1.6.19-2.fc39.aarch64"
@@ -187,10 +187,10 @@
       "evra": "3.18-3.fc39.aarch64"
     },
     "crun": {
-      "evra": "1.9-1.fc39.aarch64"
+      "evra": "1.9.2-1.fc39.aarch64"
     },
     "crun-wasm": {
-      "evra": "1.9-1.fc39.aarch64"
+      "evra": "1.9.2-1.fc39.aarch64"
     },
     "crypto-policies": {
       "evra": "20230731-1.git5ed06e0.fc39.noarch"
@@ -358,7 +358,7 @@
       "evra": "3.16.1-1.fc39.aarch64"
     },
     "fwupd": {
-      "evra": "1.9.5-1.fc39.aarch64"
+      "evra": "1.9.5-2.fc39.aarch64"
     },
     "gawk": {
       "evra": "5.2.2-2.fc39.aarch64"
@@ -385,16 +385,16 @@
       "evra": "2.78.0-3.fc39.aarch64"
     },
     "glibc": {
-      "evra": "2.38-4.fc39.aarch64"
+      "evra": "2.38-6.fc39.aarch64"
     },
     "glibc-common": {
-      "evra": "2.38-4.fc39.aarch64"
+      "evra": "2.38-6.fc39.aarch64"
     },
     "glibc-gconv-extra": {
-      "evra": "2.38-4.fc39.aarch64"
+      "evra": "2.38-6.fc39.aarch64"
     },
     "glibc-minimal-langpack": {
-      "evra": "2.38-4.fc39.aarch64"
+      "evra": "2.38-6.fc39.aarch64"
     },
     "gmp": {
       "evra": "1:6.2.1-5.fc39.aarch64"
@@ -727,7 +727,7 @@
       "evra": "2.0.0-6.fc39.aarch64"
     },
     "libnvme": {
-      "evra": "1.5-3.fc39.aarch64"
+      "evra": "1.6-1.fc39.aarch64"
     },
     "libpath_utils": {
       "evra": "0.2.1-54.fc39.aarch64"
@@ -1141,7 +1141,7 @@
       "evra": "15.6-2.aarch64"
     },
     "skopeo": {
-      "evra": "1:1.13.2-1.fc39.aarch64"
+      "evra": "1:1.13.3-1.fc39.aarch64"
     },
     "slang": {
       "evra": "2.3.3-3.fc38.aarch64"
@@ -1201,22 +1201,22 @@
       "evra": "1.9.14-1.p3.fc39.aarch64"
     },
     "systemd": {
-      "evra": "254.1-2.fc39.aarch64"
+      "evra": "254.5-2.fc39.aarch64"
     },
     "systemd-container": {
-      "evra": "254.1-2.fc39.aarch64"
+      "evra": "254.5-2.fc39.aarch64"
     },
     "systemd-libs": {
-      "evra": "254.1-2.fc39.aarch64"
+      "evra": "254.5-2.fc39.aarch64"
     },
     "systemd-pam": {
-      "evra": "254.1-2.fc39.aarch64"
+      "evra": "254.5-2.fc39.aarch64"
     },
     "systemd-resolved": {
-      "evra": "254.1-2.fc39.aarch64"
+      "evra": "254.5-2.fc39.aarch64"
     },
     "systemd-udev": {
-      "evra": "254.1-2.fc39.aarch64"
+      "evra": "254.5-2.fc39.aarch64"
     },
     "tar": {
       "evra": "2:1.35-2.fc39.aarch64"
@@ -1292,13 +1292,13 @@
     }
   },
   "metadata": {
-    "generated": "2023-10-02T00:00:00Z",
+    "generated": "2023-10-06T00:00:00Z",
     "rpmmd_repos": {
       "fedora-coreos-pool": {
-        "generated": "2023-10-01T23:23:09Z"
+        "generated": "2023-10-06T14:48:12Z"
       },
       "fedora-next": {
-        "generated": "2023-10-02T09:52:14Z"
+        "generated": "2023-10-06T09:48:10Z"
       },
       "fedora-next-updates": {
         "generated": "2018-02-20T19:13:29Z"

diff --git a/manifest-lock.overrides.aarch64.yaml b/manifest-lock.overrides.aarch64.yaml
@@ -0,0 +1,17 @@
+# This lockfile should be used to pin to a package version (`type: pin`) or to
+# fast-track packages ahead of Bodhi (`type: fast-track`). Fast-tracked
+# packages will automatically be removed once they are in the stable repos.
+#
+# IMPORTANT: YAML comments *will not* be preserved. All `pin` overrides *must*
+# include a URL in the `metadata.reason` key. Overrides of type `fast-track`
+# *should* include a Bodhi update URL in the `metadata.bodhi` key and a URL
+# in the `metadata.reason` key, though it's acceptable to omit a `reason`
+# for FCOS-specific packages (ignition, afterburn, etc.).
+
+packages:
+  crun-wasm:
+    evra: 1.9.2-1.fc39.aarch64
+    metadata:
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
+      type: fast-track
diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml
@@ -0,0 +1,17 @@
+# This lockfile should be used to pin to a package version (`type: pin`) or to
+# fast-track packages ahead of Bodhi (`type: fast-track`). Fast-tracked
+# packages will automatically be removed once they are in the stable repos.
+#
+# IMPORTANT: YAML comments *will not* be preserved. All `pin` overrides *must*
+# include a URL in the `metadata.reason` key. Overrides of type `fast-track`
+# *should* include a Bodhi update URL in the `metadata.bodhi` key and a URL
+# in the `metadata.reason` key, though it's acceptable to omit a `reason`
+# for FCOS-specific packages (ignition, afterburn, etc.).
+
+packages:
+  crun-wasm:
+    evra: 1.9.2-1.fc39.x86_64
+    metadata:
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
+      type: fast-track
diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml
@@ -9,32 +9,38 @@
 # for FCOS-specific packages (ignition, afterburn, etc.).
 
 packages:
-  containerd:
-    evr: 1.6.19-2.fc39
+  bind-libs:
+    evr: 32:9.18.19-1.fc39
     metadata:
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1578
-      type: pin
-  glibc:
-    evr: 2.38-6.fc39
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-b4acb0f7c6
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
+      type: fast-track
+  bind-license:
+    evra: 32:9.18.19-1.fc39.noarch
     metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-b4acb0f7c6
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
       type: fast-track
-  glibc-common:
-    evr: 2.38-6.fc39
+  bind-utils:
+    evr: 32:9.18.19-1.fc39
     metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-b4acb0f7c6
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
       type: fast-track
-  glibc-gconv-extra:
-    evr: 2.38-6.fc39
+  containerd:
+    evr: 1.6.19-2.fc39
+    metadata:
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1578
+      type: pin
+  crun:
+    evr: 1.9.2-1.fc39
     metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
       type: fast-track
-  glibc-minimal-langpack:
-    evr: 2.38-6.fc39
+  skopeo:
+    evr: 1:1.13.3-1.fc39
     metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591
+      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-35b56210f0
+      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
       type: fast-track
diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json
@@ -52,10 +52,10 @@
       "evra": "3.1.2-4.fc39.ppc64le"
     },
     "authselect": {
-      "evra": "1.4.2-3.fc39.ppc64le"
+      "evra": "1.4.3-1.fc39.ppc64le"
     },
     "authselect-libs": {
-      "evra": "1.4.2-3.fc39.ppc64le"
+      "evra": "1.4.3-1.fc39.ppc64le"
     },
     "avahi-libs": {
       "evra": "0.8-24.fc39.ppc64le"
@@ -76,13 +76,13 @@
       "evra": "1.07.1-19.fc39.ppc64le"
     },
     "bind-libs": {
-      "evra": "32:9.18.17-1.fc39.ppc64le"
+      "evra": "32:9.18.19-1.fc39.ppc64le"
     },
     "bind-license": {
-      "evra": "32:9.18.17-1.fc39.noarch"
+      "evra": "32:9.18.19-1.fc39.noarch"
     },
     "bind-utils": {
-      "evra": "32:9.18.17-1.fc39.ppc64le"
+      "evra": "32:9.18.19-1.fc39.ppc64le"
     },
     "brcmfmac-firmware": {
       "evra": "20230919-1.fc39.noarch"
@@ -148,7 +148,7 @@
       "evra": "0.21.3-6.fc39.noarch"
     },
     "container-selinux": {
-      "evra": "2:2.221.1-1.fc39.noarch"
+      "evra": "2:2.222.0-1.fc39.noarch"
     },
     "containerd": {
       "evra": "1.6.19-2.fc39.ppc64le"
@@ -187,7 +187,7 @@
       "evra": "3.18-3.fc39.ppc64le"
     },
     "crun": {
-      "evra": "1.9-1.fc39.ppc64le"
+      "evra": "1.9.2-1.fc39.ppc64le"
     },
     "crypto-policies": {
       "evra": "20230731-1.git5ed06e0.fc39.noarch"
@@ -343,7 +343,7 @@
       "evra": "3.16.1-1.fc39.ppc64le"
     },
     "fwupd": {
-      "evra": "1.9.5-1.fc39.ppc64le"
+      "evra": "1.9.5-2.fc39.ppc64le"
     },
     "gawk": {
       "evra": "5.2.2-2.fc39.ppc64le"
@@ -370,16 +370,16 @@
       "evra": "2.78.0-3.fc39.ppc64le"
     },
     "glibc": {
-      "evra": "2.38-4.fc39.ppc64le"
+      "evra": "2.38-6.fc39.ppc64le"
     },
     "glibc-common": {
-      "evra": "2.38-4.fc39.ppc64le"
+      "evra": "2.38-6.fc39.ppc64le"
     },
     "glibc-gconv-extra": {
-      "evra": "2.38-4.fc39.ppc64le"
+      "evra": "2.38-6.fc39.ppc64le"
     },
     "glibc-minimal-langpack": {
-      "evra": "2.38-4.fc39.ppc64le"
+      "evra": "2.38-6.fc39.ppc64le"
     },
     "gmp": {
       "evra": "1:6.2.1-5.fc39.ppc64le"
@@ -712,7 +712,7 @@
       "evra": "2.0.0-6.fc39.ppc64le"
     },
     "libnvme": {
-      "evra": "1.5-3.fc39.ppc64le"
+      "evra": "1.6-1.fc39.ppc64le"
     },
     "libpath_utils": {
       "evra": "0.2.1-54.fc39.ppc64le"
@@ -1138,7 +1138,7 @@
       "evra": "2.2-4.fc39.ppc64le"
     },
     "skopeo": {
-      "evra": "1:1.13.2-1.fc39.ppc64le"
+      "evra": "1:1.13.3-1.fc39.ppc64le"
     },
     "slang": {
       "evra": "2.3.3-3.fc38.ppc64le"
@@ -1195,22 +1195,22 @@
       "evra": "1.9.14-1.p3.fc39.ppc64le"
     },
     "systemd": {
-      "evra": "254.1-2.fc39.ppc64le"
+      "evra": "254.5-2.fc39.ppc64le"
     },
     "systemd-container": {
-      "evra": "254.1-2.fc39.ppc64le"
+      "evra": "254.5-2.fc39.ppc64le"
     },
     "systemd-libs": {
-      "evra": "254.1-2.fc39.ppc64le"
+      "evra": "254.5-2.fc39.ppc64le"
     },
     "systemd-pam": {
-      "evra": "254.1-2.fc39.ppc64le"
+      "evra": "254.5-2.fc39.ppc64le"
     },
     "systemd-resolved": {
-      "evra": "254.1-2.fc39.ppc64le"
+      "evra": "254.5-2.fc39.ppc64le"
     },
     "systemd-udev": {
-      "evra": "254.1-2.fc39.ppc64le"
+      "evra": "254.5-2.fc39.ppc64le"
     },
     "tar": {
       "evra": "2:1.35-2.fc39.ppc64le"
@@ -1283,13 +1283,13 @@
     }
   },
   "metadata": {
-    "generated": "2023-10-02T00:00:00Z",
+    "generated": "2023-10-06T00:00:00Z",
     "rpmmd_repos": {
       "fedora-coreos-pool": {
-        "generated": "2023-10-01T23:23:25Z"
+        "generated": "2023-10-06T14:47:45Z"
       },
       "fedora-next": {
-        "generated": "2023-10-02T09:52:11Z"
+        "generated": "2023-10-06T09:48:08Z"
       },
       "fedora-next-updates": {
         "generated": "2018-02-28T16:06:00Z"