diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-10-12 21:46:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-15 10:01:42 +0100 |
commit | 751cb2c894122807ed62341ae6b5f129a65e399b (patch) | |
tree | 06a336087a9fba0d14c599d89578b85e347b8660 /meta/lib | |
parent | 1a95d4a0701b87ae3674239a01aabe38a0123585 (diff) | |
download | poky-751cb2c894122807ed62341ae6b5f129a65e399b.tar.gz |
Remove RM_OLD_IMAGE, it's no longer useful
Since the move to put image deployment under sstate control in
d54339d4b1a7e884de636f6325ca60409ebd95ff old images are automatically
removed before a new image is deployed (the default behaviour of the
sstate logic).
RM_OLD_IMAGE is therefore no longer required to provide this
behaviour, remove the variable and its users.
(From OE-Core rev: 93631befe8b962bf99524746b49f4ebca336175c)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/buildoptions.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index 86e4836b83..9487898b07 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py | |||
@@ -30,22 +30,6 @@ class ImageOptionsTests(oeSelfTest): | |||
30 | incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed) | 30 | incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed) |
31 | self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) | 31 | self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) |
32 | 32 | ||
33 | @testcase(925) | ||
34 | def test_rm_old_image(self): | ||
35 | bitbake("core-image-minimal") | ||
36 | deploydir = get_bb_var("DEPLOY_DIR_IMAGE", target="core-image-minimal") | ||
37 | imagename = get_bb_var("IMAGE_LINK_NAME", target="core-image-minimal") | ||
38 | deploydir_files = os.listdir(deploydir) | ||
39 | track_original_files = [] | ||
40 | for image_file in deploydir_files: | ||
41 | if imagename in image_file and os.path.islink(os.path.join(deploydir, image_file)): | ||
42 | track_original_files.append(os.path.realpath(os.path.join(deploydir, image_file))) | ||
43 | self.write_config("RM_OLD_IMAGE = \"1\"") | ||
44 | bitbake("-C rootfs core-image-minimal") | ||
45 | deploydir_files = os.listdir(deploydir) | ||
46 | remaining_not_expected = [path for path in track_original_files if os.path.basename(path) in deploydir_files] | ||
47 | self.assertFalse(remaining_not_expected, msg="\nThe following image files were not removed: %s" % ', '.join(map(str, remaining_not_expected))) | ||
48 | |||
49 | @testcase(286) | 33 | @testcase(286) |
50 | def test_ccache_tool(self): | 34 | def test_ccache_tool(self): |
51 | bitbake("ccache-native") | 35 | bitbake("ccache-native") |