summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-12-13 20:19:47 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-16 16:16:06 +0000
commit17f7f3a43e863d9e2a16dd02face5137a4f4b225 (patch)
tree6ec89966cff25d4d64ab953eabe9360f475f6159
parentbf10cc692491acd615b503779c44e6d7ab3ffe68 (diff)
downloadopenembedded-core-17f7f3a43e863d9e2a16dd02face5137a4f4b225.tar.gz
openembedded-core-17f7f3a43e863d9e2a16dd02face5137a4f4b225.tar.bz2
openembedded-core-17f7f3a43e863d9e2a16dd02face5137a4f4b225.zip
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>
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/recipes-core/images/core-image-minimal-initramfs.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f79e3f7231..1c2161682c 100644
--- 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 d078c1004f..5149f31546 100644
--- 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"