Skip to content

Commit

Permalink
osbuild: rename qemu_stage_buildroot to host_as_buildroot
Browse files Browse the repository at this point in the history
It's now used for more than just the qemu stages so let's
rename it to be slightly more appropriate.
  • Loading branch information
dustymabe committed Nov 19, 2024
1 parent e1d29fc commit dfa1bfa
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 16 deletions.
9 changes: 6 additions & 3 deletions src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@ mpp-vars:
mpp-if: osname in ['rhcos', 'scos']
then: "name:deployed-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:
Expand Down
9 changes: 6 additions & 3 deletions src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@ mpp-vars:
mpp-if: osname in ['rhcos', 'scos']
then: "name:deployed-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:
Expand Down
9 changes: 6 additions & 3 deletions src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,15 @@ mpp-vars:
mpp-if: osname in ['rhcos', 'scos']
then: "name:deployed-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:
Expand Down
9 changes: 6 additions & 3 deletions src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@ mpp-vars:
mpp-if: osname in ['rhcos', 'scos']
then: "name:deployed-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:
Expand Down
4 changes: 2 additions & 2 deletions src/osbuild-manifests/platform.hyperv.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/osbuild-manifests/platform.qemu-secex.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/osbuild-manifests/platform.qemu.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit dfa1bfa

Please sign in to comment.