From 41b34441c22143cbabace3d794ead05801afb7a0 Mon Sep 17 00:00:00 2001 From: "Ng, Wei Tee" Date: Sun, 23 Jul 2017 16:51:56 -0700 Subject: initramfs-framework: include install-efi module in recipe for installation Utilized the existing init-install-efi.sh script and renamed it to install-efi.sh to manage the installation process of images in initramfs-framework model. This script will be executed when "install" option is being chosen in the grub menu and install the image on the target platform. A new install-efi module is being added in the recipe to handle the installation process using initramfs-framework. [YOCTO #10989] Signed-off-by: Ng, Wei Tee Signed-off-by: Richard Purdie --- .../initrdscripts/initramfs-framework_1.0.bb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb') diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 211e89d5d3..9d69a696f1 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -5,7 +5,11 @@ RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" PR = "r2" -inherit allarch +# While the packages maybe an allarch due to it being a +# simple script, reality is that it is Host specific based +# on the COMPATIBLE_HOST below, which needs to take precedence +#inherit allarch +INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "file://init \ file://rootfs \ @@ -14,7 +18,8 @@ SRC_URI = "file://init \ file://udev \ file://e2fs \ file://debug \ - file://setup-live" + file://setup-live \ + file://install-efi.sh" S = "${WORKDIR}" @@ -41,6 +46,9 @@ do_install() { # debug install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug + # install-efi + install -m 0755 ${WORKDIR}/install-efi.sh ${D}/init.d/install-efi.sh + # Create device nodes expected by some kernels in initramfs # before even executing /init. install -d ${D}/dev @@ -53,7 +61,8 @@ PACKAGES = "${PN}-base \ initramfs-module-e2fs \ initramfs-module-rootfs \ initramfs-module-debug \ - initramfs-module-setup-live" + initramfs-module-setup-live \ + initramfs-module-install-efi" FILES_${PN}-base = "/init /init.d/99-finish /dev" @@ -88,3 +97,7 @@ FILES_initramfs-module-rootfs = "/init.d/90-rootfs" SUMMARY_initramfs-module-debug = "initramfs dynamic debug support" RDEPENDS_initramfs-module-debug = "${PN}-base" FILES_initramfs-module-debug = "/init.d/00-debug" + +SUMMARY_initramfs-module-install-efi = "initramfs support for installation option" +RDEPENDS_initramfs-module-install-efi = "${PN}-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid" +FILES_initramfs-module-install-efi = "/init.d/install-efi.sh" -- cgit 1.2.3-korg