summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDaniel Ammann <daniel.ammann@bytesatwork.ch>2020-07-20 13:08:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-22 12:45:56 +0100
commitef4677373c4daef08048a4c88b487a5258c9a954 (patch)
tree53e8a1fe2d35372eebc6640ce7955ae2e65d1f95 /meta/classes
parent147db377f41e9ead122b654a2be54dc0ca83f020 (diff)
downloadpoky-ef4677373c4daef08048a4c88b487a5258c9a954.tar.gz
image.bbclass: improve wording when image size exceeds the specified limit
(From OE-Core rev: fcaab9d686a4afe53a4693f3b30634215d682389) Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 694b58fc9f..3b5600e550 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -548,14 +548,14 @@ def get_rootfs_size(d):
548 if rootfs_maxsize: 548 if rootfs_maxsize:
549 rootfs_maxsize_int = int(rootfs_maxsize) 549 rootfs_maxsize_int = int(rootfs_maxsize)
550 if base_size > rootfs_maxsize_int: 550 if base_size > rootfs_maxsize_int:
551 bb.fatal("The rootfs size %d(K) overrides IMAGE_ROOTFS_MAXSIZE: %d(K)" % \ 551 bb.fatal("The rootfs size %d(K) exceeds IMAGE_ROOTFS_MAXSIZE: %d(K)" % \
552 (base_size, rootfs_maxsize_int)) 552 (base_size, rootfs_maxsize_int))
553 553
554 # Check the initramfs size against INITRAMFS_MAXSIZE (if set) 554 # Check the initramfs size against INITRAMFS_MAXSIZE (if set)
555 if image_fstypes == initramfs_fstypes != '' and initramfs_maxsize: 555 if image_fstypes == initramfs_fstypes != '' and initramfs_maxsize:
556 initramfs_maxsize_int = int(initramfs_maxsize) 556 initramfs_maxsize_int = int(initramfs_maxsize)
557 if base_size > initramfs_maxsize_int: 557 if base_size > initramfs_maxsize_int:
558 bb.error("The initramfs size %d(K) overrides INITRAMFS_MAXSIZE: %d(K)" % \ 558 bb.error("The initramfs size %d(K) exceeds INITRAMFS_MAXSIZE: %d(K)" % \
559 (base_size, initramfs_maxsize_int)) 559 (base_size, initramfs_maxsize_int))
560 bb.error("You can set INITRAMFS_MAXSIZE a larger value. Usually, it should") 560 bb.error("You can set INITRAMFS_MAXSIZE a larger value. Usually, it should")
561 bb.fatal("be less than 1/2 of ram size, or you may fail to boot it.\n") 561 bb.fatal("be less than 1/2 of ram size, or you may fail to boot it.\n")