summaryrefslogtreecommitdiffstats
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:19:27 +0000
commitb46e11843169ef7769ae25708c17cdd3b809d6ae (patch)
tree9f697e458bdd951e600212be6a2d9db4ecfeed50
parent45d3f0c801256b4f26e96183a055a4383115df08 (diff)
downloadpoky-b46e11843169ef7769ae25708c17cdd3b809d6ae.tar.gz
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". (From OE-Core rev: 17f7f3a43e863d9e2a16dd02face5137a4f4b225) 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
673DL_DIR ?= "${TOPDIR}/downloads" 673DL_DIR ?= "${TOPDIR}/downloads"
674SSTATE_DIR ?= "${TOPDIR}/sstate-cache" 674SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
675IMAGE_FSTYPES ?= "tar.gz" 675IMAGE_FSTYPES ?= "tar.gz"
676INITRAMFS_FSTYPES ?= "cpio.gz"
676PCMCIA_MANAGER ?= "pcmcia-cs" 677PCMCIA_MANAGER ?= "pcmcia-cs"
677DEFAULT_TASK_PROVIDER ?= "task-base" 678DEFAULT_TASK_PROVIDER ?= "task-base"
678MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" 679MACHINE_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 = ""
10 10
11LICENSE = "MIT" 11LICENSE = "MIT"
12 12
13IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
13inherit core-image 14inherit core-image
14 15
15IMAGE_ROOTFS_SIZE = "8192" 16IMAGE_ROOTFS_SIZE = "8192"
16IMAGE_FSTYPES =+ "cpio.gz"