summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-07-12 15:24:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:47 +0100
commit15ba3c1a96b49af836c46ce474c85413d8116122 (patch)
treeb8d98863e1b6dfab7501c0dc910e9038935fa3ba
parent7eaf3056c8fe3f7fc9420a1ca2bdfe315e4f48db (diff)
downloadpoky-15ba3c1a96b49af836c46ce474c85413d8116122.tar.gz
initramfs-framework: make rootfs module optional
It still gets installed by default via RRECOMMENDS without having to update users of the framework (because without it, the framework is incomplete), but that recommendation can be overridden on a per-image basis. (From OE-Core rev: 73bfaa0e57a3b6c8779ba716c1e38fcbee734947) Signed-off-by: Patrick Ohly <patrick.ohly@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/initrdscripts/initramfs-framework_1.0.bb15
1 files changed, 14 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 89e153d348..67a1b04d28 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -47,9 +47,18 @@ PACKAGES = "${PN}-base \
47 initramfs-module-mdev \ 47 initramfs-module-mdev \
48 initramfs-module-udev \ 48 initramfs-module-udev \
49 initramfs-module-e2fs \ 49 initramfs-module-e2fs \
50 initramfs-module-rootfs \
50 initramfs-module-debug" 51 initramfs-module-debug"
51 52
52FILES_${PN}-base = "/init /init.d/90-rootfs /init.d/99-finish /dev" 53FILES_${PN}-base = "/init /init.d/99-finish /dev"
54
55# 99-finish in base depends on some other module which mounts
56# the rootfs, like 90-rootfs. To replace that default, use
57# BAD_RECOMMENDATIONS += "initramfs-module-rootfs" in your
58# initramfs recipe and install something else, or install
59# something that runs earlier (for example, a 89-my-rootfs)
60# and mounts the rootfs. Then 90-rootfs will proceed immediately.
61RRECOMMENDS_${PN}-base += "initramfs-module-rootfs"
53 62
54SUMMARY_initramfs-module-mdev = "initramfs support for mdev" 63SUMMARY_initramfs-module-mdev = "initramfs support for mdev"
55RDEPENDS_initramfs-module-mdev = "${PN}-base busybox-mdev" 64RDEPENDS_initramfs-module-mdev = "${PN}-base busybox-mdev"
@@ -63,6 +72,10 @@ SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystem
63RDEPENDS_initramfs-module-e2fs = "${PN}-base" 72RDEPENDS_initramfs-module-e2fs = "${PN}-base"
64FILES_initramfs-module-e2fs = "/init.d/10-e2fs" 73FILES_initramfs-module-e2fs = "/init.d/10-e2fs"
65 74
75SUMMARY_initramfs-module-rootfs = "initramfs support for locating and mounting the root partition"
76RDEPENDS_initramfs-module-rootfs = "${PN}-base"
77FILES_initramfs-module-rootfs = "/init.d/90-rootfs"
78
66SUMMARY_initramfs-module-debug = "initramfs dynamic debug support" 79SUMMARY_initramfs-module-debug = "initramfs dynamic debug support"
67RDEPENDS_initramfs-module-debug = "${PN}-base" 80RDEPENDS_initramfs-module-debug = "${PN}-base"
68FILES_initramfs-module-debug = "/init.d/00-debug" 81FILES_initramfs-module-debug = "/init.d/00-debug"