| Message ID | 20250414124715.2358883-1-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | CI: switch to CPIO archives | expand |
On Mon, Apr 14, 2025 at 01:47:15PM +0100, Andrew Cooper wrote: > Package domU in /boot for dom0 and insert into the uncompressed part of dom0's > rootfs, rather than recompressing it as part of the overlay. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Anthony PERARD <anthony.perard@vates.tech> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Michal Orzel <michal.orzel@amd.com> > CC: Doug Goldstein <cardoe@cardoe.com> > CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> > > A little RFC. It wants extending to the other tests too. > --- > automation/scripts/qubes-x86-64.sh | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh > index 1f90e7002c73..7ce077dfeaee 100755 > --- a/automation/scripts/qubes-x86-64.sh > +++ b/automation/scripts/qubes-x86-64.sh > @@ -185,10 +185,22 @@ Kernel \r on an \m (\l) > find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz > cd .. > rm -rf rootfs > + > + # Package domU kernel+rootfs in /boot for dom0 (uncompressed) > + mkdir -p rootfs/boot > + cd rootfs > + cp ../binaries/bzImage boot/vmlinuz > + cp ../binaries/domU-rootfs.cpio.gz boot/ This changes the name of domU rootfs - was initrd-domU, yet the domU.cfg is not updated. > + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio > + cd .. > + rm -rf rootfs > fi > > # Dom0 rootfs > cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz > +if [ -e binaries/domU-in-dom0.cpio ]; then > + cat binaries/domU-in-dom0.cpio >> binaries/dom0-rootfs.cpio.gz > +fi > cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz > cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz > > @@ -236,10 +248,6 @@ mkdir -p etc/default > echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons > echo "QEMU_XEN=/bin/false" >> etc/default/xencommons > mkdir -p var/log/xen/console > -cp ../binaries/bzImage boot/vmlinuz > -if [ -n "$domU_check" ]; then > - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU > -fi > find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz > cd .. > > -- > 2.39.5 >
diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 1f90e7002c73..7ce077dfeaee 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -185,10 +185,22 @@ Kernel \r on an \m (\l) find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs + + # Package domU kernel+rootfs in /boot for dom0 (uncompressed) + mkdir -p rootfs/boot + cd rootfs + cp ../binaries/bzImage boot/vmlinuz + cp ../binaries/domU-rootfs.cpio.gz boot/ + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio + cd .. + rm -rf rootfs fi # Dom0 rootfs cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +if [ -e binaries/domU-in-dom0.cpio ]; then + cat binaries/domU-in-dom0.cpio >> binaries/dom0-rootfs.cpio.gz +fi cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz @@ -236,10 +248,6 @@ mkdir -p etc/default echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -fi find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd ..
Package domU in /boot for dom0 and insert into the uncompressed part of dom0's rootfs, rather than recompressing it as part of the overlay. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Anthony PERARD <anthony.perard@vates.tech> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Michal Orzel <michal.orzel@amd.com> CC: Doug Goldstein <cardoe@cardoe.com> CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> A little RFC. It wants extending to the other tests too. --- automation/scripts/qubes-x86-64.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)