| Submitter | lumag |
|---|---|
| Date | Dec. 13, 2011, 4:19 p.m. |
| Message ID | <1323793193-31090-3-git-send-email-dbaryshkov@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/16835/ |
| State | Accepted |
| Commit | 17f7f3a43e863d9e2a16dd02face5137a4f4b225 |
| Headers | show |
Comments
On Tue, 2011-12-13 at 20:19 +0400, Dmitry Eremin-Solenikov wrote: > 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> > --- > meta/conf/bitbake.conf | 1 + > .../images/core-image-minimal-initramfs.bb | 2 +- > 2 files changed, 2 insertions(+), 1 deletions(-) Merged to master, thanks. Richard
Patch
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f79e3f7..1c21616 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 d078c10..5149f31 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"
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> --- meta/conf/bitbake.conf | 1 + .../images/core-image-minimal-initramfs.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)