summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-13 13:36:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-18 18:57:06 +0100
commit53078a00ceab5d6aaa61c77fcb73f0d4aa788e00 (patch)
tree30294c690263c35575f38ede2a2d636475e38dc9
parent2a3e8ad0b92c01b4b8d2c3bc84ee7b9c90e70863 (diff)
downloadpoky-53078a00ceab5d6aaa61c77fcb73f0d4aa788e00.tar.gz
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 <california.l.sullivan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/images/core-image-minimal-initramfs.bb10
1 files changed, 9 insertions, 1 deletions
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 \
3the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ 3the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
4first 'init' program more efficiently." 4first 'init' program more efficiently."
5 5
6PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" 6INITRAMFS_SCRIPTS ?= "\
7 initramfs-framework-base \
8 initramfs-module-setup-live \
9 initramfs-module-udev \
10 initramfs-module-install \
11 initramfs-module-install-efi \
12 "
13
14PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
7 15
8# Do not pollute the initrd image with rootfs features 16# Do not pollute the initrd image with rootfs features
9IMAGE_FEATURES = "" 17IMAGE_FEATURES = ""