From d8182bbe25dfedc7caa5960c076cf46944b0bef2 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 15 Nov 2024 13:32:42 -0500 Subject: [PATCH] osbuild: rename qemu_stage_buildroot to host_as_buildroot It's now used for more than just the qemu stages so let's rename it to be slightly more appropriate. --- src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml | 9 ++++++--- src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml | 9 ++++++--- src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml | 9 ++++++--- src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml | 9 ++++++--- src/osbuild-manifests/platform.hyperv.ipp.yaml | 4 ++-- src/osbuild-manifests/platform.qemu-secex.ipp.yaml | 2 +- src/osbuild-manifests/platform.qemu.ipp.yaml | 2 +- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml index 01da561fee..d2d64555b8 100644 --- a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml @@ -34,12 +34,15 @@ mpp-vars: mpp-if: osname in ['rhcos', 'scos'] then: "name:plain-files-tree" else: "" - # For the qemu stages we'll use the host buildroot (COSA) - # because we definitely don't include qemu-img in CoreOS. "" + # For some stages (i.e. the qemu stages) we'll use the host as + # the buildroot (i.e. COSA in most cases but sometimes just + # the actual HOST filesystem like in coreos/custom-coreos-disk-images). + # This is useful/necessary because we definitely don't include + # qemu-img or tools like zip in the actual CoreOS OS. "" here # means to use the host as buildroot. It is worth noting that # the host buildroot is the default if nothing is specified. # We're still defining it here in an attempt to be explicit. - qemu_stage_buildroot: "" + host_as_buildroot: "" mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml index a2f10d0d4a..4fd54a99d6 100644 --- a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml @@ -34,12 +34,15 @@ mpp-vars: mpp-if: osname in ['rhcos', 'scos'] then: "name:plain-files-tree" else: "" - # For the qemu stages we'll use the host buildroot (COSA) - # because we definitely don't include qemu-img in CoreOS. "" + # For some stages (i.e. the qemu stages) we'll use the host as + # the buildroot (i.e. COSA in most cases but sometimes just + # the actual HOST filesystem like in coreos/custom-coreos-disk-images). + # This is useful/necessary because we definitely don't include + # qemu-img or tools like zip in the actual CoreOS OS. "" here # means to use the host as buildroot. It is worth noting that # the host buildroot is the default if nothing is specified. # We're still defining it here in an attempt to be explicit. - qemu_stage_buildroot: "" + host_as_buildroot: "" mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml index af1b0d38ad..0f075ebe84 100644 --- a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml @@ -38,12 +38,15 @@ mpp-vars: mpp-if: osname in ['rhcos', 'scos'] then: "name:plain-files-tree" else: "" - # For the qemu stages we'll use the host buildroot (COSA) - # because we definitely don't include qemu-img in CoreOS. "" + # For some stages (i.e. the qemu stages) we'll use the host as + # the buildroot (i.e. COSA in most cases but sometimes just + # the actual HOST filesystem like in coreos/custom-coreos-disk-images). + # This is useful/necessary because we definitely don't include + # qemu-img or tools like zip in the actual CoreOS OS. "" here # means to use the host as buildroot. It is worth noting that # the host buildroot is the default if nothing is specified. # We're still defining it here in an attempt to be explicit. - qemu_stage_buildroot: "" + host_as_buildroot: "" mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml index 6bc015467c..308b4d5be0 100644 --- a/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml +++ b/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml @@ -34,12 +34,15 @@ mpp-vars: mpp-if: osname in ['rhcos', 'scos'] then: "name:plain-files-tree" else: "" - # For the qemu stages we'll use the host buildroot (COSA) - # because we definitely don't include qemu-img in CoreOS. "" + # For some stages (i.e. the qemu stages) we'll use the host as + # the buildroot (i.e. COSA in most cases but sometimes just + # the actual HOST filesystem like in coreos/custom-coreos-disk-images). + # This is useful/necessary because we definitely don't include + # qemu-img or tools like zip in the actual CoreOS OS. "" here # means to use the host as buildroot. It is worth noting that # the host buildroot is the default if nothing is specified. # We're still defining it here in an attempt to be explicit. - qemu_stage_buildroot: "" + host_as_buildroot: "" mpp-define-images: - id: image sector_size: diff --git a/src/osbuild-manifests/platform.hyperv.ipp.yaml b/src/osbuild-manifests/platform.hyperv.ipp.yaml index 33bf5180f3..799386178f 100644 --- a/src/osbuild-manifests/platform.hyperv.ipp.yaml +++ b/src/osbuild-manifests/platform.hyperv.ipp.yaml @@ -53,7 +53,7 @@ pipelines: target: /boot - name: raw-hyperv-image-vhdx build: - mpp-format-string: '{qemu_stage_buildroot}' + mpp-format-string: '{host_as_buildroot}' stages: - type: org.osbuild.qemu inputs: @@ -70,7 +70,7 @@ pipelines: type: vhdx - name: hyperv build: - mpp-format-string: '{qemu_stage_buildroot}' + mpp-format-string: '{host_as_buildroot}' stages: - type: org.osbuild.zip inputs: diff --git a/src/osbuild-manifests/platform.qemu-secex.ipp.yaml b/src/osbuild-manifests/platform.qemu-secex.ipp.yaml index 3f0326924c..2c1c8b0c99 100644 --- a/src/osbuild-manifests/platform.qemu-secex.ipp.yaml +++ b/src/osbuild-manifests/platform.qemu-secex.ipp.yaml @@ -353,7 +353,7 @@ pipelines: mpp-format-int: '{image_secex.layout[''roothash''].size}' - name: qemu-secex build: - mpp-format-string: '{qemu_stage_buildroot}' + mpp-format-string: '{host_as_buildroot}' stages: - type: org.osbuild.qemu inputs: diff --git a/src/osbuild-manifests/platform.qemu.ipp.yaml b/src/osbuild-manifests/platform.qemu.ipp.yaml index 06eeac35fb..4a1fa95e68 100644 --- a/src/osbuild-manifests/platform.qemu.ipp.yaml +++ b/src/osbuild-manifests/platform.qemu.ipp.yaml @@ -82,7 +82,7 @@ pipelines: target: /boot - name: qemu build: - mpp-format-string: '{qemu_stage_buildroot}' + mpp-format-string: '{host_as_buildroot}' stages: - type: org.osbuild.qemu inputs: