Re: [PATCH v5 02/12] rootfs: Allow to overwrite the initramfs generation cmds

["'cedric.hombourger@siemens.com' via isar-users" <isar-users@googlegroups.com>]

On Fri, 2025-10-31 at 16:03 +0100, Cedric Hombourger wrote:
> On Thu, 2025-10-30 at 10:44 +0100, Quirin Gylstorff wrote:
> > From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> > 
> > This is in preparation to support additional initramfs generators
> > like dracut.
> > 
> > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> > ---
> >  meta/classes/rootfs.bbclass | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/classes/rootfs.bbclass
> > b/meta/classes/rootfs.bbclass
> > index 2fef3120..98da62fb 100644
> > --- a/meta/classes/rootfs.bbclass
> > +++ b/meta/classes/rootfs.bbclass
> > @@ -5,7 +5,13 @@ inherit deb-dl-dir
> >  
> >  ROOTFS_ARCH ?= "${DISTRO_ARCH}"
> >  ROOTFS_DISTRO ?= "${DISTRO}"
> > +
> > +def initramfs_generator_cmdline(d):
> > +    return "update-initramfs -u -v -k \"$kernel_version\""
> > +
> >  ROOTFS_PACKAGES ?= ""
> > +ROOTFS_INITRAMFS_GENERATOR_CMD = "${@
> > d.getVar('ROOTFS_INITRAMFS_GENERATOR_CMDLINE').split()[0]}"
> > +ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "${@
> > initramfs_generator_cmdline(d)}"
> 
> Can we make it easier to switch to dracut for a regular image (vs
> initramfs-image which is covered by your series).

My bad. It's sufficient to simply use IMAGE_PREINSTALL += "dracut"
Test case modified.

>  I used your patch
> series to check what it takes to add test cases and I had to do the
> following in citest.cy:
> 
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index a1214e9c..df0f66e0 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -278,6 +278,25 @@ class KernelTests(CIBaseTest):
>          self.perform_build_test(targets, image_install='
> '.join(modules), lines=lines)
> 
> 
> +class InitRdTests(CIBaseTest):
> +    """
> +    Tests for initrd generation
> +    :avocado: tags=initrd,full
> +    """
> +
> +    DRACUT_CONF = [
> +        "INITRAMFS_GENERATOR_PKG = 'dracut'",
> +        "ROOTFS_INITRAMFS_GENERATOR_CMDLINE:forcevariable =
> 'dracut'"

This is now changed to:

class InitRdTests(CIBaseTest):
    """
    Tests for initrd generation
    :avocado: tags=initrd,full
    """

    DRACUT_CONF = [
        “IMAGE_PREINSTALL:append = ‘ dracut'",
        “IMAGE_INSTALL:remove = ‘enable-fsck'"
    ]

    def test_dracut_in_image(self):
        """Test switch to dracut in an image recipe."""

        targets = ['mc:qemuamd64-bookworm:isar-image-ci']
        self.init()
        self.perform_build_test(targets, lines=InitRdTests.DRACUT_CONF)

(the enable-fsck package requires initramfs-tools)

> +    ]
> +
> +    def test_dracut_in_image(self):
> +        """Test switch to dracut in an image recipe."""
> +
> +        targets = ['mc:qemuamd64-bookworm:isar-image-ci']
> +        self.init()
> +        self.perform_build_test(targets,
> lines=InitRdTests.DRACUT_CONF)
> +
> +
> 
> I am going to add more tests, including builds of your custom
> recipes.
> I would be super grateful if we could simplify the above use-case to
> support switching between initramfs-tools and dracut with a single
> variable assignment
> 
> >  ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}"
> >  
> >  # Features of the rootfs creation:
> > @@ -254,7 +260,7 @@ rootfs_disable_initrd_generation() {
> >      set -e
> >  
> >      mkdir -p "${ROOTFSDIR}${ROOTFS_STUBS_DIR}"
> > -    ln -s /usr/bin/true ${ROOTFSDIR}${ROOTFS_STUBS_DIR}/update-
> > initramfs
> > +    ln -s /usr/bin/true
> > ${ROOTFSDIR}${ROOTFS_STUBS_DIR}/${ROOTFS_INITRAMFS_GENERATOR_CMD}
> >  
> >      mkdir -p '${ROOTFSDIR}/etc/apt/apt.conf.d'
> >      echo 'DPkg::Path
> > ${ROOTFS_STUBS_DIR}:/usr/sbin:/usr/bin:/sbin:/bin;' \
> > @@ -577,7 +583,7 @@ rootfs_generate_initramfs() {
> >              echo "Total number of modules: $mods_total"
> >              echo "Generating initrd for kernel version:
> > $kernel_version"
> >              sudo -E chroot "${ROOTFSDIR}" sh -c ' \
> > -                update-initramfs -u -v -k "$kernel_version"'
> > +                ${ROOTFS_INITRAMFS_GENERATOR_CMDLINE};'
> >          done
> >          if [ -n "${INITRD_DEPLOY_FILE}" ]; then
> >              if [ -f "${ROOTFSDIR}/initrd.img" ]; then
> 

-- 
Cedric Hombourger
Siemens AG
www.siemens.com

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/c5ea8e9e9f1661083730d3f4536e3a50e3bbf541.camel%40siemens.com.