diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/rootfs.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 12fbf67a6e..a90712b247 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py | |||
@@ -29,7 +29,7 @@ import os | |||
29 | 29 | ||
30 | from wic import msger | 30 | from wic import msger |
31 | from wic.pluginbase import SourcePlugin | 31 | from wic.pluginbase import SourcePlugin |
32 | from wic.utils.oe.misc import find_bitbake_env_lines, find_artifact | 32 | from wic.utils.oe.misc import get_bitbake_var |
33 | 33 | ||
34 | class RootfsPlugin(SourcePlugin): | 34 | class RootfsPlugin(SourcePlugin): |
35 | """ | 35 | """ |
@@ -43,12 +43,7 @@ class RootfsPlugin(SourcePlugin): | |||
43 | if os.path.isdir(rootfs_dir): | 43 | if os.path.isdir(rootfs_dir): |
44 | return rootfs_dir | 44 | return rootfs_dir |
45 | 45 | ||
46 | bitbake_env_lines = find_bitbake_env_lines(rootfs_dir) | 46 | image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) |
47 | if not bitbake_env_lines: | ||
48 | msg = "Couldn't get bitbake environment, exiting." | ||
49 | msger.error(msg) | ||
50 | |||
51 | image_rootfs_dir = find_artifact(bitbake_env_lines, "IMAGE_ROOTFS") | ||
52 | if not os.path.isdir(image_rootfs_dir): | 47 | if not os.path.isdir(image_rootfs_dir): |
53 | msg = "No valid artifact IMAGE_ROOTFS from image named" | 48 | msg = "No valid artifact IMAGE_ROOTFS from image named" |
54 | msg += " %s has been found at %s, exiting.\n" % \ | 49 | msg += " %s has been found at %s, exiting.\n" % \ |