diff --git a/src/0001-osbuild-util-containers.py-add-container_mount-funct.patch b/src/0001-osbuild-util-containers.py-add-container_mount-funct.patch index 855511755c..cfd9464062 100644 --- a/src/0001-osbuild-util-containers.py-add-container_mount-funct.patch +++ b/src/0001-osbuild-util-containers.py-add-container_mount-funct.patch @@ -1,8 +1,7 @@ -From 701fa40dfce9a70c1dafdee32907a154463a1a44 Mon Sep 17 00:00:00 2001 +From 3c7e393f5442808c776c414c4f9e096cf8790901 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 9 Oct 2025 22:05:44 -0400 -Subject: [PATCH 1/5] osbuild/util/containers.py: add container_mount() - functionality +Subject: [PATCH 1/5] util/containers.py: add container_mount() functionality As prep for a later patch this moves the container image mounting code from stages/org.osbuild.container-deploy into the containers library. diff --git a/src/0002-osbuild-util-containers.py-rename-variable.patch b/src/0002-osbuild-util-containers.py-rename-variable.patch index 57fe1bffb5..01b33f4453 100644 --- a/src/0002-osbuild-util-containers.py-rename-variable.patch +++ b/src/0002-osbuild-util-containers.py-rename-variable.patch @@ -1,7 +1,7 @@ -From 81b9bd29075c004c48a5de685904328f657f33bd Mon Sep 17 00:00:00 2001 +From dc7d55f20ecc826bcadcb308460687909a6f13e4 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 10 Oct 2025 09:04:21 -0400 -Subject: [PATCH 2/5] osbuild/util/containers.py: rename variable +Subject: [PATCH 2/5] util/containers.py: rename variable This is really a name and not a tag (it doesn't include :tag) so let's rename the variable to be a little more clear. diff --git a/src/0003-osbuild-util-containers.py-drop-copy-when-using-cont.patch b/src/0003-osbuild-util-containers.py-drop-copy-when-using-cont.patch index ec0a4a52eb..f2ae6377be 100644 --- a/src/0003-osbuild-util-containers.py-drop-copy-when-using-cont.patch +++ b/src/0003-osbuild-util-containers.py-drop-copy-when-using-cont.patch @@ -1,7 +1,7 @@ -From dd484a371b04bb384d6d189b038d6c7997a3da44 Mon Sep 17 00:00:00 2001 +From b06025a2e69a5a89d2ef63a2f4e7f463c92b396c Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 15 Oct 2025 15:13:38 -0400 -Subject: [PATCH 3/5] osbuild/util/containers.py: drop copy when using +Subject: [PATCH 3/5] util/containers.py: drop copy when using containers-storage input If we are just mounting the container then there's really no reason diff --git a/src/0004-drop-remove_signatures-from-org.osbuild.container-de.patch b/src/0004-drop-remove_signatures-from-org.osbuild.container-de.patch index bd9b991351..96eae875e7 100644 --- a/src/0004-drop-remove_signatures-from-org.osbuild.container-de.patch +++ b/src/0004-drop-remove_signatures-from-org.osbuild.container-de.patch @@ -1,4 +1,4 @@ -From 5ff3e403868955cff2bccc0fa7335bda31e47d9e Mon Sep 17 00:00:00 2001 +From f54ca54acd3aa910b63f63bd948b3ec2dc715238 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 15 Oct 2025 15:18:43 -0400 Subject: [PATCH 4/5] drop remove_signatures from org.osbuild.container-deploy diff --git a/src/0005-tools-osbuild-mpp-support-mpp-resolve-for-org.osbuil.patch b/src/0005-tools-osbuild-mpp-support-mpp-resolve-for-org.osbuil.patch index 3bff7479fb..09ee7fb4d3 100644 --- a/src/0005-tools-osbuild-mpp-support-mpp-resolve-for-org.osbuil.patch +++ b/src/0005-tools-osbuild-mpp-support-mpp-resolve-for-org.osbuil.patch @@ -1,4 +1,4 @@ -From ad65cf287f85729bc19b6d8e8e7f53eade379ea7 Mon Sep 17 00:00:00 2001 +From d2562f3720dc03dc52e0e43c921af64f2c8a5341 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 15 Oct 2025 15:49:55 -0400 Subject: [PATCH 5/5] tools/osbuild-mpp: support mpp-resolve for diff --git a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml index 92bfe0fab4..c883b4575d 100644 --- a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml @@ -137,7 +137,7 @@ pipelines: type: org.osbuild.container-deploy inputs: images: - type: org.osbuild.containers + type: org.osbuild.containers-storage origin: org.osbuild.source mpp-resolve-images: images: @@ -225,7 +225,7 @@ pipelines: - mpp-format-string: '{extra_kargs}' inputs: images: - type: org.osbuild.containers + type: org.osbuild.containers-storage origin: org.osbuild.source mpp-resolve-images: images: diff --git a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml index bad0daa693..4beceae013 100644 --- a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml @@ -139,7 +139,7 @@ pipelines: type: org.osbuild.container-deploy inputs: images: - type: org.osbuild.containers + type: org.osbuild.containers-storage origin: org.osbuild.source mpp-resolve-images: images: @@ -220,7 +220,7 @@ pipelines: - mpp-format-string: '{extra_kargs}' inputs: images: - type: org.osbuild.containers + type: org.osbuild.containers-storage origin: org.osbuild.source mpp-resolve-images: images: diff --git a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml index 25911c5c2c..9e0bc0dcf6 100644 --- a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml @@ -129,7 +129,7 @@ pipelines: type: org.osbuild.container-deploy inputs: images: - type: org.osbuild.containers + type: org.osbuild.containers-storage origin: org.osbuild.source mpp-resolve-images: images: @@ -213,7 +213,7 @@ pipelines: - mpp-format-string: '{extra_kargs}' inputs: images: - type: org.osbuild.containers + type: org.osbuild.containers-storage origin: org.osbuild.source mpp-resolve-images: images: