From: Andreas Reichel <[email protected]> Some modules of wic have changed place
Signed-off-by: Andreas Reichel <[email protected]> --- scripts/lib/wic/plugins/source/efibootguard-boot.py | 13 ++++++------- scripts/lib/wic/plugins/source/efibootguard-efi.py | 12 ++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py index e9e0868..bad7c27 100644 --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py @@ -28,12 +28,14 @@ import os import shutil +import logging -from wic import msger from wic.pluginbase import SourcePlugin -from wic.utils.misc import get_custom_config -from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ - BOOTDD_EXTRA_SPACE +from wic.engine import get_custom_config +from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ + BOOTDD_EXTRA_SPACE + +msger = logging.getLogger('wic') class EfibootguardBootPlugin(SourcePlugin): """ @@ -86,9 +88,6 @@ class EfibootguardBootPlugin(SourcePlugin): msger.error("HDDDIR not set, exiting\n") os.exit(1) - # just so the result notes display it - creator.set_bootimg_dir(bootimg_dir) - staging_kernel_dir = kernel_dir hdddir = "%s/hdd/%s.%s" % (cr_workdir, part.label, part.lineno) diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py index 0ba6b8c..8a33412 100644 --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py @@ -29,12 +29,14 @@ import os import os.path import shutil +import logging -from wic import msger from wic.pluginbase import SourcePlugin -from wic.utils.misc import get_custom_config -from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ - BOOTDD_EXTRA_SPACE +from wic.engine import get_custom_config +from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ + BOOTDD_EXTRA_SPACE + +msger = logging.getLogger('wic') class EfibootguardEFIPlugin(SourcePlugin): """ @@ -57,8 +59,6 @@ class EfibootguardEFIPlugin(SourcePlugin): bootimg_dir = get_bitbake_var("HDDDIR") if not bootimg_dir: msger.error("HDDDIR not set, exiting\n") - # just so the result notes display it - creator.set_bootimg_dir(bootimg_dir) staging_kernel_dir = kernel_dir -- 2.16.0 -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/20180124102351.17078-8-andreas.reichel.ext%40siemens.com. For more options, visit https://groups.google.com/d/optout.
