summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index cc72b2f7cb..abf24942e8 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -71,8 +71,13 @@ class BootimgPartitionPlugin(SourcePlugin):
71 install_cmd = "install -d %s" % hdddir 71 install_cmd = "install -d %s" % hdddir
72 exec_cmd(install_cmd) 72 exec_cmd(install_cmd)
73 73
74 if not bootimg_dir:
75 bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
76 if not bootimg_dir:
77 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
78
74 msger.debug('Bootimg dir: %s' % bootimg_dir) 79 msger.debug('Bootimg dir: %s' % bootimg_dir)
75 img_deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 80
76 boot_files = get_bitbake_var("IMAGE_BOOT_FILES") 81 boot_files = get_bitbake_var("IMAGE_BOOT_FILES")
77 82
78 if not boot_files: 83 if not boot_files:
@@ -93,7 +98,7 @@ class BootimgPartitionPlugin(SourcePlugin):
93 98
94 for deploy_entry in deploy_files: 99 for deploy_entry in deploy_files:
95 src, dst = deploy_entry 100 src, dst = deploy_entry
96 src_path = os.path.join(img_deploy_dir, src) 101 src_path = os.path.join(bootimg_dir, src)
97 dst_path = os.path.join(hdddir, dst) 102 dst_path = os.path.join(hdddir, dst)
98 103
99 msger.debug('Install %s as %s' % (os.path.basename(src_path), 104 msger.debug('Install %s as %s' % (os.path.basename(src_path),