summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDaniel Ammann <daniel.ammann@bytesatwork.ch>2020-07-20 11:08:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-31 21:02:52 (GMT)
commit4b3d87f149fbdf0ae968450cb9903c7f42ad3e93 (patch)
tree5b3bcd686658b7f65ad0e06cd62debe853050768 /meta/classes
parent9d7e7b5b574f1620a6516a27e8f8cfd418b827b0 (diff)
downloadpoky-4b3d87f149fbdf0ae968450cb9903c7f42ad3e93.tar.gz
image.bbclass: improve wording when image size exceeds the specified limit
(From OE-Core rev: faf93355614c5e5d9aec8222a7df780324868c7a) Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fcaab9d686a4afe53a4693f3b30634215d682389) Signed-off-by: Steve Sakoman <steve@sakoman.com> 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 07aa1f1..6620a9e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -551,14 +551,14 @@ def get_rootfs_size(d):
551 if rootfs_maxsize: 551 if rootfs_maxsize:
552 rootfs_maxsize_int = int(rootfs_maxsize) 552 rootfs_maxsize_int = int(rootfs_maxsize)
553 if base_size > rootfs_maxsize_int: 553 if base_size > rootfs_maxsize_int:
554 bb.fatal("The rootfs size %d(K) overrides IMAGE_ROOTFS_MAXSIZE: %d(K)" % \ 554 bb.fatal("The rootfs size %d(K) exceeds IMAGE_ROOTFS_MAXSIZE: %d(K)" % \
555 (base_size, rootfs_maxsize_int)) 555 (base_size, rootfs_maxsize_int))
556 556
557 # Check the initramfs size against INITRAMFS_MAXSIZE (if set) 557 # Check the initramfs size against INITRAMFS_MAXSIZE (if set)
558 if image_fstypes == initramfs_fstypes != '' and initramfs_maxsize: 558 if image_fstypes == initramfs_fstypes != '' and initramfs_maxsize:
559 initramfs_maxsize_int = int(initramfs_maxsize) 559 initramfs_maxsize_int = int(initramfs_maxsize)
560 if base_size > initramfs_maxsize_int: 560 if base_size > initramfs_maxsize_int:
561 bb.error("The initramfs size %d(K) overrides INITRAMFS_MAXSIZE: %d(K)" % \ 561 bb.error("The initramfs size %d(K) exceeds INITRAMFS_MAXSIZE: %d(K)" % \
562 (base_size, initramfs_maxsize_int)) 562 (base_size, initramfs_maxsize_int))
563 bb.error("You can set INITRAMFS_MAXSIZE a larger value. Usually, it should") 563 bb.error("You can set INITRAMFS_MAXSIZE a larger value. Usually, it should")
564 bb.fatal("be less than 1/2 of ram size, or you may fail to boot it.\n") 564 bb.fatal("be less than 1/2 of ram size, or you may fail to boot it.\n")