From bbfaa8953716b06be289c1f052ddc7f5074f637f Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Thu, 22 Apr 2021 09:59:24 +0200 Subject: [PATCH] distro-netmodule: Always build with ostree initramfs With our current design, the default kernel (virtual/kernel) is different than the initramfs kernels. But when building an initramfs image, it was still rebuild because the INITRAMFS_IMAGE variable was not defined. In order to avoid this rebuild we need to always enforce the use of the ostree initramfs image for the default kernel. This is not so clean since we add a permanent dependency to the ostree layer, but having a cleaner solution would require to completely rethink the way the kernel is handled in our yocto environment. BugzID: 71360 --- conf/distro/netmodule-linux.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf index 200be23..83935c5 100644 --- a/conf/distro/netmodule-linux.conf +++ b/conf/distro/netmodule-linux.conf @@ -101,3 +101,8 @@ KERNEL_MODULE_AUTOLOAD += "cryptodev" EXTRA_IMAGECMD_append_ext4 = " -O ^64bit" EXTRA_IMAGECMD_append_ota-ext4 = " -O ^64bit" + +# The default kernel is packed with ostree initramfs +# This is required to avoid rebuilding the kernel when switching +# between ostree and ramdisk images +INITRAMFS_IMAGE ?= "initramfs-ostree-image"