bitbake.conf, core-image-minimal-initramfs: add INITRAMFS_FSTYPES

Initramfs images don't benefit from usual IMAGE_FSTYPES overrides. The
only sane values for them are "cpio.XXX". If IMAGE_FSTYPES is set to
include 'live', building core-image-minimal-initramfs can result in
build error, if the image is built before the kernel. To stop initramfs
images from responding on IMAGE_FSTYPES settings, but still allow
users/developers to override defaults (e.g. to generate "cpio.lzma"
initramfs), introduce INITRAMFS_FSTYPES variable, by default set to
"cpio.gz".

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f79e3f7231739f55bbc3837e8c2b4b08966bb9b6..1c2161682c6f0b65938b6cffe1b14bc85c271aba 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -673,6 +673,7 @@ require conf/abi_version.conf
 DL_DIR ?= "${TOPDIR}/downloads"
 SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 IMAGE_FSTYPES ?= "tar.gz"
+INITRAMFS_FSTYPES ?= "cpio.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"

diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index d078c1004f4ed93b104cca03b4eb40be24d3e2e8..5149f31546174b54f88b85b677874a87d25c69eb 100644 (file)
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -10,7 +10,7 @@ IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"
 
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 inherit core-image
 
 IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_FSTYPES =+ "cpio.gz"