File tree Expand file tree Collapse file tree 7 files changed +28
-16
lines changed
Expand file tree Collapse file tree 7 files changed +28
-16
lines changed Original file line number Diff line number Diff line change @@ -34,12 +34,15 @@ mpp-vars:
3434 mpp-if : osname in ['rhcos', 'scos']
3535 then : " name:deployed-tree"
3636 else : " "
37- # For the qemu stages we'll use the host buildroot (COSA)
38- # because we definitely don't include qemu-img in CoreOS. ""
37+ # For some stages (i.e. the qemu stages) we'll use the host as
38+ # the buildroot (i.e. COSA in most cases but sometimes just
39+ # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
40+ # This is useful/necessary because we definitely don't include
41+ # qemu-img or tools like zip in the actual CoreOS OS. "" here
3942 # means to use the host as buildroot. It is worth noting that
4043 # the host buildroot is the default if nothing is specified.
4144 # We're still defining it here in an attempt to be explicit.
42- qemu_stage_buildroot : " "
45+ host_as_buildroot : " "
4346mpp-define-images :
4447 - id : image
4548 sector_size :
Original file line number Diff line number Diff line change @@ -34,12 +34,15 @@ mpp-vars:
3434 mpp-if : osname in ['rhcos', 'scos']
3535 then : " name:deployed-tree"
3636 else : " "
37- # For the qemu stages we'll use the host buildroot (COSA)
38- # because we definitely don't include qemu-img in CoreOS. ""
37+ # For some stages (i.e. the qemu stages) we'll use the host as
38+ # the buildroot (i.e. COSA in most cases but sometimes just
39+ # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
40+ # This is useful/necessary because we definitely don't include
41+ # qemu-img or tools like zip in the actual CoreOS OS. "" here
3942 # means to use the host as buildroot. It is worth noting that
4043 # the host buildroot is the default if nothing is specified.
4144 # We're still defining it here in an attempt to be explicit.
42- qemu_stage_buildroot : " "
45+ host_as_buildroot : " "
4346mpp-define-images :
4447 - id : image
4548 sector_size :
Original file line number Diff line number Diff line change @@ -38,12 +38,15 @@ mpp-vars:
3838 mpp-if : osname in ['rhcos', 'scos']
3939 then : " name:deployed-tree"
4040 else : " "
41- # For the qemu stages we'll use the host buildroot (COSA)
42- # because we definitely don't include qemu-img in CoreOS. ""
41+ # For some stages (i.e. the qemu stages) we'll use the host as
42+ # the buildroot (i.e. COSA in most cases but sometimes just
43+ # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
44+ # This is useful/necessary because we definitely don't include
45+ # qemu-img or tools like zip in the actual CoreOS OS. "" here
4346 # means to use the host as buildroot. It is worth noting that
4447 # the host buildroot is the default if nothing is specified.
4548 # We're still defining it here in an attempt to be explicit.
46- qemu_stage_buildroot : " "
49+ host_as_buildroot : " "
4750mpp-define-images :
4851 - id : image
4952 sector_size :
Original file line number Diff line number Diff line change @@ -34,12 +34,15 @@ mpp-vars:
3434 mpp-if : osname in ['rhcos', 'scos']
3535 then : " name:deployed-tree"
3636 else : " "
37- # For the qemu stages we'll use the host buildroot (COSA)
38- # because we definitely don't include qemu-img in CoreOS. ""
37+ # For some stages (i.e. the qemu stages) we'll use the host as
38+ # the buildroot (i.e. COSA in most cases but sometimes just
39+ # the actual HOST filesystem like in coreos/custom-coreos-disk-images).
40+ # This is useful/necessary because we definitely don't include
41+ # qemu-img or tools like zip in the actual CoreOS OS. "" here
3942 # means to use the host as buildroot. It is worth noting that
4043 # the host buildroot is the default if nothing is specified.
4144 # We're still defining it here in an attempt to be explicit.
42- qemu_stage_buildroot : " "
45+ host_as_buildroot : " "
4346mpp-define-images :
4447 - id : image
4548 sector_size :
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ pipelines:
5353 target : /boot
5454 - name : raw-hyperv-image-vhdx
5555 build :
56- mpp-format-string : ' {qemu_stage_buildroot }'
56+ mpp-format-string : ' {host_as_buildroot }'
5757 stages :
5858 - type : org.osbuild.qemu
5959 inputs :
@@ -70,7 +70,7 @@ pipelines:
7070 type : vhdx
7171 - name : hyperv
7272 build :
73- mpp-format-string : ' {qemu_stage_buildroot }'
73+ mpp-format-string : ' {host_as_buildroot }'
7474 stages :
7575 - type : org.osbuild.zip
7676 inputs :
Original file line number Diff line number Diff line change @@ -353,7 +353,7 @@ pipelines:
353353 mpp-format-int : ' {image_secex.layout['' roothash'' ].size}'
354354 - name : qemu-secex
355355 build :
356- mpp-format-string : ' {qemu_stage_buildroot }'
356+ mpp-format-string : ' {host_as_buildroot }'
357357 stages :
358358 - type : org.osbuild.qemu
359359 inputs :
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ pipelines:
8282 target : /boot
8383 - name : qemu
8484 build :
85- mpp-format-string : ' {qemu_stage_buildroot }'
85+ mpp-format-string : ' {host_as_buildroot }'
8686 stages :
8787 - type : org.osbuild.qemu
8888 inputs :
You can’t perform that action at this time.
0 commit comments