diff options
| author | Manuel Leonhardt <mleonhardt@arri.de> | 2025-09-09 12:41:28 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-09-11 11:31:57 +0100 |
| commit | ffe0aa9cda0e99ecea5cd62d85e0a98d5c839c6e (patch) | |
| tree | 033196517fee9cbeefd126793e7916c025f692d9 /meta/lib | |
| parent | a1bd1174ce5edd6edab79964f38efd02952b0529 (diff) | |
| download | poky-ffe0aa9cda0e99ecea5cd62d85e0a98d5c839c6e.tar.gz | |
image.bbclass: preserve debugfs tarball with checksum fstype
Previously, when adding checksum fstypes to IMAGE_FSTYPES_DEBUGFS, e.g.
IMAGE_FSTYPES_DEBUGFS = "tar.bz2 tar.bz2.sha256sum", only the checksum
file remained in DEPLOY_DIR while the tarball file was removed. The
underlying issue was that inside gen_conversion_cmds, removing the
debugfs_ prefix from type broke the comparison with alltypes where the
prefix was expected.
(From OE-Core rev: 560c7676b81fb344b7db538d65973a49807ab140)
Signed-off-by: Manuel Leonhardt <mleonhardt@arri.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/imagefeatures.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 94d01ba116..87c3da228a 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py | |||
| @@ -277,16 +277,19 @@ SKIP_RECIPE[busybox] = "Don't build this" | |||
| 277 | """ | 277 | """ |
| 278 | 278 | ||
| 279 | image = 'core-image-minimal' | 279 | image = 'core-image-minimal' |
| 280 | image_fstypes_debugfs = 'tar.bz2' | 280 | config = """ |
| 281 | features = 'IMAGE_GEN_DEBUGFS = "1"\n' | 281 | IMAGE_GEN_DEBUGFS = "1" |
| 282 | features += 'IMAGE_FSTYPES_DEBUGFS = "%s"\n' % image_fstypes_debugfs | 282 | IMAGE_FSTYPES_DEBUGFS = "tar.bz2 tar.bz2.sha256sum" |
| 283 | self.write_config(features) | 283 | """ |
| 284 | self.write_config(config) | ||
| 284 | 285 | ||
| 285 | bitbake(image) | 286 | bitbake(image) |
| 286 | bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image) | 287 | bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image) |
| 287 | 288 | ||
| 288 | dbg_tar_file = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s-dbg.%s" % (bb_vars['IMAGE_LINK_NAME'], image_fstypes_debugfs)) | 289 | dbg_tar_file = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s-dbg.tar.bz2" % bb_vars['IMAGE_LINK_NAME']) |
| 289 | self.assertTrue(os.path.exists(dbg_tar_file), 'debug filesystem not generated at %s' % dbg_tar_file) | 290 | self.assertTrue(os.path.exists(dbg_tar_file), 'debug filesystem not generated at %s' % dbg_tar_file) |
| 291 | dbg_tar_sha_file = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s-dbg.tar.bz2.sha256sum" % bb_vars['IMAGE_LINK_NAME']) | ||
| 292 | self.assertTrue(os.path.exists(dbg_tar_sha_file), 'debug filesystem sha256sum not generated at %s' % dbg_tar_sha_file) | ||
| 290 | result = runCmd('cd %s; tar xvf %s' % (bb_vars['DEPLOY_DIR_IMAGE'], dbg_tar_file)) | 293 | result = runCmd('cd %s; tar xvf %s' % (bb_vars['DEPLOY_DIR_IMAGE'], dbg_tar_file)) |
| 291 | self.assertEqual(result.status, 0, msg='Failed to extract %s: %s' % (dbg_tar_file, result.output)) | 294 | self.assertEqual(result.status, 0, msg='Failed to extract %s: %s' % (dbg_tar_file, result.output)) |
| 292 | result = runCmd('find %s -name %s' % (bb_vars['DEPLOY_DIR_IMAGE'], "udevadm")) | 295 | result = runCmd('find %s -name %s' % (bb_vars['DEPLOY_DIR_IMAGE'], "udevadm")) |