summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-09-01 17:04:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:28 +0100
commit06c1139c51e60d22afb6162d51300c381175aead (patch)
tree6dd0855bfa7b2d456ff8bc2d1f18f2880ae1aa32 /meta
parent9a2c33517d2b74d89ba9f43756368509abbe654f (diff)
downloadpoky-06c1139c51e60d22afb6162d51300c381175aead.tar.gz
initramfs-framework: split setup-live and install-efi into separate recipes
Having these the initramfs-framework recipe forced initramfs-framework users to build several tools they didn't need, and made it more difficult to declare the recipe as allarch. Fixes [YOCTO #12024]. (From OE-Core rev: e4cc1a22dd4fc9b3b12808c86213eb613f1ecb51) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb20
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb18
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb18
3 files changed, 38 insertions, 18 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 77b2ff8959..c07a5fc8d6 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -14,8 +14,7 @@ SRC_URI = "file://init \
14 file://udev \ 14 file://udev \
15 file://e2fs \ 15 file://e2fs \
16 file://debug \ 16 file://debug \
17 file://setup-live \ 17 "
18 file://install-efi.sh"
19 18
20S = "${WORKDIR}" 19S = "${WORKDIR}"
21 20
@@ -27,9 +26,6 @@ do_install() {
27 install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs 26 install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs
28 install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish 27 install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish
29 28
30 # setup-live
31 install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live
32
33 # mdev 29 # mdev
34 install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev 30 install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev
35 31
@@ -42,9 +38,6 @@ do_install() {
42 # debug 38 # debug
43 install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug 39 install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug
44 40
45 # install-efi
46 install -m 0755 ${WORKDIR}/install-efi.sh ${D}/init.d/install-efi.sh
47
48 # Create device nodes expected by some kernels in initramfs 41 # Create device nodes expected by some kernels in initramfs
49 # before even executing /init. 42 # before even executing /init.
50 install -d ${D}/dev 43 install -d ${D}/dev
@@ -57,8 +50,7 @@ PACKAGES = "${PN}-base \
57 initramfs-module-e2fs \ 50 initramfs-module-e2fs \
58 initramfs-module-rootfs \ 51 initramfs-module-rootfs \
59 initramfs-module-debug \ 52 initramfs-module-debug \
60 initramfs-module-setup-live \ 53 "
61 initramfs-module-install-efi"
62 54
63FILES_${PN}-base = "/init /init.d/99-finish /dev" 55FILES_${PN}-base = "/init /init.d/99-finish /dev"
64 56
@@ -78,10 +70,6 @@ SUMMARY_initramfs-module-udev = "initramfs support for udev"
78RDEPENDS_initramfs-module-udev = "${PN}-base udev" 70RDEPENDS_initramfs-module-udev = "${PN}-base udev"
79FILES_initramfs-module-udev = "/init.d/01-udev" 71FILES_initramfs-module-udev = "/init.d/01-udev"
80 72
81SUMMARY_initramfs-module-setup-live = "initramfs support for setup live"
82RDEPENDS_initramfs-module-setup-live = "${PN}-base udev-extraconf"
83FILES_initramfs-module-setup-live = "/init.d/80-setup-live"
84
85SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" 73SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems"
86RDEPENDS_initramfs-module-e2fs = "${PN}-base" 74RDEPENDS_initramfs-module-e2fs = "${PN}-base"
87FILES_initramfs-module-e2fs = "/init.d/10-e2fs" 75FILES_initramfs-module-e2fs = "/init.d/10-e2fs"
@@ -93,7 +81,3 @@ FILES_initramfs-module-rootfs = "/init.d/90-rootfs"
93SUMMARY_initramfs-module-debug = "initramfs dynamic debug support" 81SUMMARY_initramfs-module-debug = "initramfs dynamic debug support"
94RDEPENDS_initramfs-module-debug = "${PN}-base" 82RDEPENDS_initramfs-module-debug = "${PN}-base"
95FILES_initramfs-module-debug = "/init.d/00-debug" 83FILES_initramfs-module-debug = "/init.d/00-debug"
96
97SUMMARY_initramfs-module-install-efi = "initramfs support for installation option"
98RDEPENDS_initramfs-module-install-efi = "${PN}-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid"
99FILES_initramfs-module-install-efi = "/init.d/install-efi.sh"
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
new file mode 100644
index 0000000000..8143f315fd
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
@@ -0,0 +1,18 @@
1SUMMARY = "initramfs-framework module for installation option"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid"
5
6PR = "r1"
7
8FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
9SRC_URI = "file://install-efi.sh"
10
11S = "${WORKDIR}"
12
13do_install() {
14 install -d ${D}/init.d
15 install -m 0755 ${WORKDIR}/install-efi.sh ${D}/init.d/install-efi.sh
16}
17
18FILES_${PN} = "/init.d/install-efi.sh"
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb
new file mode 100644
index 0000000000..7627cdc417
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb
@@ -0,0 +1,18 @@
1SUMMARY = "initramfs-framework module for live booting"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf"
5
6PR = "r1"
7
8FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
9SRC_URI = "file://setup-live"
10
11S = "${WORKDIR}"
12
13do_install() {
14 install -d ${D}/init.d
15 install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live
16}
17
18FILES_${PN} = "/init.d/80-setup-live"