]> code.ossystems Code Review - openembedded-core.git/commitdiff
initramfs-framework: add install module
authorCalifornia Sullivan <california.l.sullivan@intel.com>
Tue, 14 Nov 2017 22:10:09 +0000 (14:10 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Nov 2017 23:41:35 +0000 (23:41 +0000)
The non-EFI counterpart for installation was previously missing for
initramfs-framework. This simply puts the normal install script in the
correct location for initramfs-framework to make use of it.

Partial fix for [YOCTO #12346].

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/conf/layer.conf
meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb [new file with mode: 0644]

index 034232474fe65aeefb7b0d9adcc0774b1886e1a5..67820588d37b05762ee525df1d05e0da00594a49 100644 (file)
@@ -57,6 +57,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   initramfs-module-install-efi->e2fsprogs \
   initramfs-module-install-efi->parted \
   initramfs-module-install-efi->util-linux \
+  initramfs-module-install->e2fsprogs \
+  initramfs-module-install->grub \
+  initramfs-module-install->parted \
+  initramfs-module-install->util-linux \
   liberation-fonts->fontconfig \
   cantarell-fonts->fontconfig \
   gnome-icon-theme->librsvg \
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
new file mode 100644 (file)
index 0000000..ce7f165
--- /dev/null
@@ -0,0 +1,20 @@
+SUMMARY = "initramfs-framework module for installation option"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
+
+PR = "r1"
+
+inherit allarch
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI = "file://init-install.sh"
+
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/init.d
+    install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
+}
+
+FILES_${PN} = "/init.d/install.sh"