diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-11-07 10:32:26 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-11-20 15:33:02 -0800 |
commit | d53dbb38c43da3fd04fed9a55e7b3b9e2c512b9a (patch) | |
tree | fbe372dba00d45bbf9fbfbb3726708dc2590daeb /recipes-core/images | |
parent | 5adbf6df4fd89e7531ccccfb9cec7a5314d635f0 (diff) | |
download | meta-intel-d53dbb38c43da3fd04fed9a55e7b3b9e2c512b9a.tar.gz |
meta-intel: Reorganize the layout to remove common
Remove the concept of the common directory and move all the recipes-* dirs
to the top level as a normal layer would be. layer.conf is updated appropriately
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'recipes-core/images')
-rw-r--r-- | recipes-core/images/core-image-minimal-initramfs.bbappend | 6 | ||||
-rw-r--r-- | recipes-core/images/core-image-tiny.bb | 37 |
2 files changed, 43 insertions, 0 deletions
diff --git a/recipes-core/images/core-image-minimal-initramfs.bbappend b/recipes-core/images/core-image-minimal-initramfs.bbappend new file mode 100644 index 00000000..4ddca375 --- /dev/null +++ b/recipes-core/images/core-image-minimal-initramfs.bbappend | |||
@@ -0,0 +1,6 @@ | |||
1 | # Use initramfs-framework instead of initramfs-live* | ||
2 | PACKAGE_INSTALL_remove_intel-x86-common = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi" | ||
3 | PACKAGE_INSTALL_append_intel-x86-common = " initramfs-framework-base initramfs-module-udev initramfs-module-setup-live initramfs-module-install-efi" | ||
4 | |||
5 | # Add i915 graphics firmware | ||
6 | PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915" | ||
diff --git a/recipes-core/images/core-image-tiny.bb b/recipes-core/images/core-image-tiny.bb new file mode 100644 index 00000000..ed39fd77 --- /dev/null +++ b/recipes-core/images/core-image-tiny.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | SUMMARY = "A tiny image just capable of allowing a device to boot from RAM, \ | ||
2 | this image recipe generates an image file which rather boots from initrd than \ | ||
3 | from storage, it achieves this by using wic to pick up the artifacts generated \ | ||
4 | by the core-image-tiny-initramfs image" | ||
5 | |||
6 | # The actual rootfs/initrd will be the one from core-image-tiny-initramfs, so | ||
7 | # we reset IMAGE_INSTALL to avoid building other things that will be pointless | ||
8 | IMAGE_INSTALL = "" | ||
9 | |||
10 | # Do not pollute the initrd image with rootfs features | ||
11 | IMAGE_FEATURES = "" | ||
12 | |||
13 | IMAGE_LINGUAS = " " | ||
14 | |||
15 | LICENSE = "MIT" | ||
16 | |||
17 | IMAGE_ROOTFS_SIZE ?= "8192" | ||
18 | |||
19 | IMAGE_FSTYPES = "wic" | ||
20 | inherit core-image | ||
21 | |||
22 | # We get some parts from image-live that we need in order to boot from initrd | ||
23 | INITRD_IMAGE_LIVE ?= "core-image-tiny-initramfs" | ||
24 | |||
25 | python() { | ||
26 | image_b = d.getVar('IMAGE_BASENAME') | ||
27 | initrd_i = d.getVar('INITRD_IMAGE_LIVE') | ||
28 | if image_b == initrd_i: | ||
29 | bb.error('INITRD_IMAGE_LIVE %s cannot use the requested IMAGE_FSTYPE' % initrd_i) | ||
30 | bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') | ||
31 | elif initrd_i: | ||
32 | d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) | ||
33 | } | ||
34 | |||
35 | WKS_FILE_intel-corei7-64 = "core-image-tiny.wks.in" | ||
36 | WKS_FILE_intel-core2-32 = "core-image-tiny.wks.in" | ||
37 | WKS_FILE_intel-quark = "mktinygalileodisk.wks" | ||