diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-07-07 02:33:59 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-10 17:37:38 +0100 |
| commit | 7384d2831c713ac5999aca83c312154dc15cec56 (patch) | |
| tree | 0e86318a328c451a7dcfa861a3ec60ea5bef34d2 | |
| parent | 16aa94e4543fc6e6540b203bc716e6f275f514c7 (diff) | |
| download | openembedded-core-7384d2831c713ac5999aca83c312154dc15cec56.tar.gz openembedded-core-7384d2831c713ac5999aca83c312154dc15cec56.tar.bz2 openembedded-core-7384d2831c713ac5999aca83c312154dc15cec56.zip | |
kernel.bbclass: update KERNEL_IMAGE_MAXSIZE
* Make KERNEL_IMAGE_MAXSIZE and IMAGE_ROOTFS_SIZE have the same algorithm:
- Use Kbytes as the unit since we use this in other codes.
- Use "du" rather than "ls" to figure out the size since we use this in
image.py.
[YOCTO #2610]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/kernel.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index f5d725878f..b2e9d4cb36 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -422,10 +422,13 @@ addtask do_strip before do_sizecheck after do_kernel_link_vmlinux # with a fixed length or there is a limit in transferring the kernel to memory do_sizecheck() { if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then - cd ${B} - size=`ls -lL ${KERNEL_OUTPUT} | awk '{ print $5}'` + invalid=`echo ${KERNEL_IMAGE_MAXSIZE} | sed 's/[0-9]//g'` + if [ -n "$invalid" ]; then + die "Invalid KERNEL_IMAGE_MAXSIZE: ${KERNEL_IMAGE_MAXSIZE}, should be an integerx (The unit is Kbytes)" + fi + size=`du -ks ${B}/${KERNEL_OUTPUT} | awk '{ print $1}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then - die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular." + die "This kernel (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device. Please reduce the size of the kernel by making more of it modular." fi fi } |