On Mon, Apr 07, 2025 at 05:22:05PM +0100, Andrew Cooper wrote:
> On 07/04/2025 5:17 pm, Andrew Cooper wrote:
> > On 07/04/2025 1:31 pm, Marek Marczykowski-Górecki wrote:
> >> Build initrd format directly digestable by the kernel. Additionally,
> >> include it itself inside as boot/initrd-domU file, for domU booting in
> >> tests.
> >> This should avoid the need to repack tar -> cpio as part of the test
> >> job.
> >>
> >> Keep generating initrd.tar.gz as that's still used by older branches.
> >>
> >> Signed-off-by: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com>
> > Reviewed-by: Andrew Cooper <andrew.coop...@citrix.com>
> >
> >> ---
> >> scripts/x86_64-rootfs-alpine.sh | 5 +++++
> >> 1 file changed, 5 insertions(+)
> >>
> >> diff --git a/scripts/x86_64-rootfs-alpine.sh
> >> b/scripts/x86_64-rootfs-alpine.sh
> >> index b70b3a5..13e85fa 100755
> >> --- a/scripts/x86_64-rootfs-alpine.sh
> >> +++ b/scripts/x86_64-rootfs-alpine.sh
> >> @@ -58,3 +58,8 @@ passwd -d "root" root
> >> cd /
> >> tar cvzf "${WORKDIR}/binaries/initrd.tar.gz" \
> >> bin dev etc home init lib mnt opt root sbin usr var
> > What's required to drop the tar version? Presumably merging the rest of
> > your series?
>
> NVM, I can't read. I'm tempted to fold in:
>
> #TODO, drop .tar.gz when Xen 4.20 drops out of testing
>
> That said, I expect we'll be backporting these changes.There is one more difference: the cpio.gz contains the whole thing twice. Once as rootfs for dom0 and then another as boot/initrd-domU. Dropping .tar.gz is probably a good idea at some point, so I'm okay with such comment added. But I imagine some future tests may benefit from just one layer, which may want introducing another cpio.gz without boot/initrd-domU included. In fact, even right now that might be useful - for example dom0less arm64 test uses just busybox for domU rootfs, not the whole archive (so with my changes dom0 rootfs has unused boot/initrd-domU included). -- Best Regards, Marek Marczykowski-Górecki Invisible Things Lab
signature.asc
Description: PGP signature
