Trigger an error if the final size is above IMAGE_FILE_MAXSIZE value. Which is
relevant if the
partition size is fixed and the user wants to be sure that the image can be
entirely installed
into its partition.
If the variable is not set, no error is trigger. It works for all filesystems.
Signed-off-by: Charles-Antoine Couret <charles-antoine.cou...@mind.be>
---
meta/classes-recipe/image.bbclass | 30 +++++++++++
meta/lib/oeqa/selftest/cases/imagefeatures.py | 52 +++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/meta/classes-recipe/image.bbclass
b/meta/classes-recipe/image.bbclass
index 7231fad940..d2fcf078c9 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -509,6 +509,7 @@ python () {
d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size')
d.prependVarFlag(task, 'postfuncs', 'create_symlinks ')
+ d.prependVarFlag(task, 'postfuncs', 'check_image_max_size ')
d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages))
d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps))
d.appendVarFlag(task, 'vardepsexclude', ' DATETIME DATE ' + '
'.join(vardepsexclude))
@@ -609,6 +610,35 @@ python create_symlinks() {
bb.note("Skipping symlink, source does not exist: %s -> %s" %
(dst, src))
}
+#
+# Check if image size is lighter than maximum size
+#
+python check_image_max_size() {
+ def get_max_image_size(d, fs):
+ max_size = d.getVar("IMAGE_FILE_MAXSIZE:%s" % fs)
+ if max_size is not None:
+ return int(max_size)
+
+ return None
+
+ deploy_dir = d.getVar('IMGDEPLOYDIR')
+ img_name = d.getVar('IMAGE_NAME')
+ taskname = d.getVar("BB_CURRENTTASK")
+ subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or
"").split()
+ imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix') or
d.expand("${IMAGE_NAME_SUFFIX}.")
+
+ for type in subimages:
+ file_name = os.path.join(deploy_dir, img_name + imgsuffix + type)
+
+ if os.path.exists(file_name):
+ file_size = os.stat(file_name).st_size / 1024
+ max_size = get_max_image_size(d, type)
+ if max_size is not None:
+ if file_size > max_size:
+ bb.error("The image %s size %d(K) exceeds
IMAGE_FILE_MAXSIZE: %d(K)" % \
+ (file_name, file_size, max_size))
+}
+
MULTILIBRE_ALLOW_REP =.
"${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|"
MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index dc88c222bd..afdc7a72fa 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -234,6 +234,58 @@ UBINIZE_ARGS_mtd_4_256 ?= "-m 4096 -p 256KiB"
self.assertTrue(os.path.exists(image_path),
"%s image %s doesn't exist" % (itype,
image_path))
+ def test_image_maxsize_success(self):
+ """
+ Summary: Check if the image built is below maximum size if set
+ Expected: image is built, size below the limit and no error are
reported
+ Product: oe-core
+ Author: Charles-Antoine Couret <charles-antoine.cou...@mind.be>
+ """
+ image = 'core-image-minimal'
+
+ config = """
+IMAGE_FSTYPES += "ext4"
+IMAGE_FILE_MAXSIZE:ext4 = "300000"
+"""
+ self.write_config(config)
+
+ res = bitbake(image)
+ bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
+
+ image_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s.%s" %
(bb_vars['IMAGE_LINK_NAME'], "ext4"))
+ # check if result image is in deploy directory
+ self.assertTrue(os.path.exists(image_path),
+ "%s image %s doesn't exist" % ("ext4", image_path))
+ # check if result image size is below than maximum value
+ self.assertTrue(os.stat(image_path).st_size / 1024 <= 300000)
+ # No error during execution
+ self.assertEqual(res.status, 0)
+
+ def test_image_maxsize_failure(self):
+ """
+ Summary: Check if the image built with size above limit is
triggering error
+ Expected: the image size is above limit and triggers error
+ Product: oe-core
+ Author: Charles-Antoine Couret <charles-antoine.cou...@mind.be>
+ """
+ image = 'core-image-minimal'
+
+ config = """
+IMAGE_FSTYPES += "ext4"
+IMAGE_FILE_MAXSIZE:ext4 = "1000"
+"""
+ self.write_config(config)
+
+ res = bitbake(image, ignore_status=True)
+ bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
+
+ image_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s.%s" %
(bb_vars['IMAGE_LINK_NAME'], "ext4"))
+ # check if result image is not generated
+ self.assertFalse(os.path.exists(image_path),
+ "%s image %s doesn't exist" % ("ext4", image_path))
+ # Error triggered during execution
+ self.assertNotEqual(res.status, 0)
+
def test_useradd_static(self):
config = """
USERADDEXTENSION = "useradd-staticids"
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190053):
https://lists.openembedded.org/g/openembedded-core/message/190053
Mute This Topic: https://lists.openembedded.org/mt/102331605/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
