From 53078a00ceab5d6aaa61c77fcb73f0d4aa788e00 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Fri, 13 Apr 2018 13:36:40 -0700 Subject: core-image-minimal-initramfs: use initramfs-framework for initialization initramfs-framework is more modular and expandable. This change was proposed in commit 28fc6ba761ed4a47efa7c43e7f7dff5e2fe72b5e "core-image-minimal-initramfs: use initramfs-framework by default" but reverted due to the selftests runqemu.RunqemuTests.test_boot_machine_iso and runqemu.RunqemuTests.test_boot_deploy_hddimg failing. Since then, the kinks have been worked out, and missing functionality that had been missed (non-EFI installation module) has been added. Since the PACKAGE_INSTALL variable was getting so long with all these individual modules getting added, I also introduced a new INITRAMFS_SCRIPTS variable to the core-image-minimal-initramfs recipe. This variable makes the recipe look much cleaner, and also allows easier replacement or additions to the scripts. Fixes [YOCTO #10987]. (From OE-Core rev: 882ae0dcce2d96a7c286fc23b22b07972d3d8f93) Signed-off-by: California Sullivan Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/images/core-image-minimal-initramfs.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/images') diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index c446e87bd1..6de860e43a 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -3,7 +3,15 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ first 'init' program more efficiently." -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" +INITRAMFS_SCRIPTS ?= "\ + initramfs-framework-base \ + initramfs-module-setup-live \ + initramfs-module-udev \ + initramfs-module-install \ + initramfs-module-install-efi \ + " + +PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -- cgit v1.2.3-54-g00ecf