diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-07-07 02:33:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-10 17:38:35 +0100 |
commit | 1cb9f7b00b5ede62a9546c39d798c876775b08c0 (patch) | |
tree | 1126f320f5b8d4c8f3419556347b048031b1bace /meta/conf | |
parent | d8364371b2987d1396cfb85658565096ff72a2cd (diff) | |
download | poky-1cb9f7b00b5ede62a9546c39d798c876775b08c0.tar.gz |
lib/oe/image.py: check the rootfs size against IMAGE_ROOTFS_MAXSIZE
* Check the rootfs size against IMAGE_ROOTFS_MAXSIZE (if set)
* Add comments for IMAGE_ROOTFS_SIZE to not confuse with IMAGE_ROOTFS_MAXSIZE
[YOCTO #2610]
(From OE-Core rev: 6acd4fc8d5e642b5c6c75fcc40dd8f37caf7ddcf)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 311e9a04c4..f4870d52a9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -688,6 +688,10 @@ IMAGE_FSTYPES ?= "tar.gz" | |||
688 | INITRAMFS_FSTYPES ?= "cpio.gz" | 688 | INITRAMFS_FSTYPES ?= "cpio.gz" |
689 | DEFAULT_TASK_PROVIDER ?= "packagegroup-base" | 689 | DEFAULT_TASK_PROVIDER ?= "packagegroup-base" |
690 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" | 690 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" |
691 | |||
692 | # The size in Kbytes for the generated image if it is larger than | ||
693 | # the required size (du -ks IMAGE_ROOTFS * IMAGE_OVERHEAD_FACTOR), | ||
694 | # and no effect if less than it. | ||
691 | IMAGE_ROOTFS_SIZE ?= "65536" | 695 | IMAGE_ROOTFS_SIZE ?= "65536" |
692 | 696 | ||
693 | # Forcefully set CACHE now so future changes to things like | 697 | # Forcefully set CACHE now so future changes to things like |