diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 5 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index e3518d2f0b..56da468fb5 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -45,10 +45,9 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
45 | @classmethod | 45 | @classmethod |
46 | def _get_bootimg_dir(cls, bootimg_dir, dirname): | 46 | def _get_bootimg_dir(cls, bootimg_dir, dirname): |
47 | """ | 47 | """ |
48 | Check if dirname exists in default bootimg_dir or | 48 | Check if dirname exists in default bootimg_dir or in STAGING_DIR. |
49 | in wic-tools STAGING_DIR. | ||
50 | """ | 49 | """ |
51 | for result in (bootimg_dir, get_bitbake_var("STAGING_DATADIR", "wic-tools")): | 50 | for result in (bootimg_dir, get_bitbake_var("STAGING_DATADIR")): |
52 | if os.path.exists("%s/%s" % (result, dirname)): | 51 | if os.path.exists("%s/%s" % (result, dirname)): |
53 | return result | 52 | return result |
54 | 53 | ||
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index db77113232..85f35f7fbe 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -342,7 +342,7 @@ class IsoImagePlugin(SourcePlugin): | |||
342 | 342 | ||
343 | if not os.path.isfile("%s/EFI/BOOT/%s" \ | 343 | if not os.path.isfile("%s/EFI/BOOT/%s" \ |
344 | % (bootimg_dir, grub_image)): | 344 | % (bootimg_dir, grub_image)): |
345 | grub_path = get_bitbake_var("STAGING_LIBDIR", "wic-tools") | 345 | grub_path = get_bitbake_var("STAGING_LIBDIR") |
346 | if not grub_path: | 346 | if not grub_path: |
347 | raise WicError("Couldn't find STAGING_LIBDIR, exiting.") | 347 | raise WicError("Couldn't find STAGING_LIBDIR, exiting.") |
348 | 348 | ||
@@ -411,7 +411,7 @@ class IsoImagePlugin(SourcePlugin): | |||
411 | exec_cmd(chmod_cmd) | 411 | exec_cmd(chmod_cmd) |
412 | 412 | ||
413 | # Prepare files for legacy boot | 413 | # Prepare files for legacy boot |
414 | syslinux_dir = get_bitbake_var("STAGING_DATADIR", "wic-tools") | 414 | syslinux_dir = get_bitbake_var("STAGING_DATADIR") |
415 | if not syslinux_dir: | 415 | if not syslinux_dir: |
416 | raise WicError("Couldn't find STAGING_DATADIR, exiting.") | 416 | raise WicError("Couldn't find STAGING_DATADIR, exiting.") |
417 | 417 | ||